summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
a36d5af)
These utility classes are already dealing with QNames, so it makes
sense to expand their capabilities to include SchemaPath serialization.
Change-Id: Ibcb931f78959eb57f834cd2892511c4963638caa
Signed-off-by: Robert Varga <rovarga@cisco.com>
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+ @Override
+ public void writeSchemaPath(final SchemaPath path) throws IOException {
+ ensureHeaderWritten();
+ output.writeBoolean(path.isAbsolute());
+
+ final Collection<QName> qnames = path.getPath();
+ output.writeInt(qnames.size());
+ for (QName qname : qnames) {
+ writeQName(qname);
+ }
+ }
+
@Override
public void writeYangInstanceIdentifier(final YangInstanceIdentifier identifier) throws IOException {
ensureHeaderWritten();
@Override
public void writeYangInstanceIdentifier(final YangInstanceIdentifier identifier) throws IOException {
ensureHeaderWritten();
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
- * Interface for reading {@link NormalizedNode}s, {@link YangInstanceIdentifier}s and {@link PathArgument}s.
+ * Interface for reading {@link NormalizedNode}s, {@link YangInstanceIdentifier}s, {@link PathArgument}s
+ * and {@link SchemaPath}s.
*/
@Beta
public interface NormalizedNodeDataInput extends DataInput {
*/
@Beta
public interface NormalizedNodeDataInput extends DataInput {
YangInstanceIdentifier readYangInstanceIdentifier() throws IOException;
PathArgument readPathArgument() throws IOException;
YangInstanceIdentifier readYangInstanceIdentifier() throws IOException;
PathArgument readPathArgument() throws IOException;
+
+ SchemaPath readSchemaPath() throws IOException;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
- * Interface for emitting {@link NormalizedNode}s, {@link YangInstanceIdentifier}s and {@link PathArgument}s.
+ * Interface for emitting {@link NormalizedNode}s, {@link YangInstanceIdentifier}s, {@link PathArgument}s
+ * and {@link SchemaPath}s.
*/
@Beta
public interface NormalizedNodeDataOutput extends AutoCloseable, DataOutput {
*/
@Beta
public interface NormalizedNodeDataOutput extends AutoCloseable, DataOutput {
void writeYangInstanceIdentifier(YangInstanceIdentifier identifier) throws IOException;
void writeYangInstanceIdentifier(YangInstanceIdentifier identifier) throws IOException;
+ void writeSchemaPath(SchemaPath path) throws IOException;
+
@Override
void close() throws IOException;
}
@Override
void close() throws IOException;
}
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
return new String(bytes, StandardCharsets.UTF_8);
}
return new String(bytes, StandardCharsets.UTF_8);
}
+ @Override
+ public SchemaPath readSchemaPath() throws IOException {
+ readSignatureMarkerAndVersionIfNeeded();
+
+ final boolean absolute = input.readBoolean();
+ final int size = input.readInt();
+ final Collection<QName> qnames = new ArrayList<>(size);
+ for (int i = 0; i < size; ++i) {
+ qnames.add(readQName());
+ }
+
+ return SchemaPath.create(qnames, absolute);
+ }
+
@Override
public YangInstanceIdentifier readYangInstanceIdentifier() throws IOException {
readSignatureMarkerAndVersionIfNeeded();
@Override
public YangInstanceIdentifier readYangInstanceIdentifier() throws IOException {
readSignatureMarkerAndVersionIfNeeded();
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetEntryNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetNodeBuilder;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetEntryNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetNodeBuilder;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.model.api.SchemaPath;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
public class NormalizedNodeStreamReaderWriterTest {
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
public class NormalizedNodeStreamReaderWriterTest {
- @SuppressWarnings("deprecation")
@Test
public void testNormalizedNodeStreaming() throws IOException {
@Test
public void testNormalizedNodeStreaming() throws IOException {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter(
- ByteStreams.newDataOutput(byteArrayOutputStream));
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ NormalizedNodeDataOutput nnout = NormalizedNodeInputOutput.newDataOutput(ByteStreams.newDataOutput(bos));
NormalizedNode<?, ?> testContainer = createTestContainer();
NormalizedNode<?, ?> testContainer = createTestContainer();
- writer.writeNormalizedNode(testContainer);
+ nnout.writeNormalizedNode(testContainer);
QName toaster = QName.create("http://netconfcentral.org/ns/toaster","2009-11-20","toaster");
QName darknessFactor = QName.create("http://netconfcentral.org/ns/toaster","2009-11-20","darknessFactor");
QName toaster = QName.create("http://netconfcentral.org/ns/toaster","2009-11-20","toaster");
QName darknessFactor = QName.create("http://netconfcentral.org/ns/toaster","2009-11-20","darknessFactor");
ContainerNode toasterContainer = Builders.containerBuilder()
.withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)).withChild(toasterNode).build();
ContainerNode toasterContainer = Builders.containerBuilder()
.withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)).withChild(toasterNode).build();
- writer.writeNormalizedNode(toasterContainer);
+ nnout.writeNormalizedNode(toasterContainer);
- NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader(
- ByteStreams.newDataInput(byteArrayOutputStream.toByteArray()));
+ NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(
+ bos.toByteArray()));
- NormalizedNode<?,?> node = reader.readNormalizedNode();
+ NormalizedNode<?,?> node = nnin.readNormalizedNode();
Assert.assertEquals(testContainer, node);
Assert.assertEquals(testContainer, node);
- node = reader.readNormalizedNode();
+ node = nnin.readNormalizedNode();
Assert.assertEquals(toasterContainer, node);
Assert.assertEquals(toasterContainer, node);
}
private static NormalizedNode<?, ?> createTestContainer() {
}
private static NormalizedNode<?, ?> createTestContainer() {
TestModel.ID_QNAME, 11)).build()).build();
}
TestModel.ID_QNAME, 11)).build()).build();
}
- @SuppressWarnings("deprecation")
@Test
public void testYangInstanceIdentifierStreaming() throws IOException {
YangInstanceIdentifier path = YangInstanceIdentifier.builder(TestModel.TEST_PATH)
.node(TestModel.OUTER_LIST_QNAME).nodeWithKey(
TestModel.INNER_LIST_QNAME, TestModel.ID_QNAME, 10).build();
@Test
public void testYangInstanceIdentifierStreaming() throws IOException {
YangInstanceIdentifier path = YangInstanceIdentifier.builder(TestModel.TEST_PATH)
.node(TestModel.OUTER_LIST_QNAME).nodeWithKey(
TestModel.INNER_LIST_QNAME, TestModel.ID_QNAME, 10).build();
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- NormalizedNodeOutputStreamWriter writer =
- new NormalizedNodeOutputStreamWriter(ByteStreams.newDataOutput(byteArrayOutputStream));
- writer.writeYangInstanceIdentifier(path);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ NormalizedNodeDataOutput nnout = NormalizedNodeInputOutput.newDataOutput(ByteStreams.newDataOutput(bos));
- NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader(
- ByteStreams.newDataInput(byteArrayOutputStream.toByteArray()));
+ nnout.writeYangInstanceIdentifier(path);
- YangInstanceIdentifier newPath = reader.readYangInstanceIdentifier();
- Assert.assertEquals(path, newPath);
+ NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(
+ bos.toByteArray()));
+ YangInstanceIdentifier newPath = nnin.readYangInstanceIdentifier();
+ Assert.assertEquals(path, newPath);
(SampleNormalizedNodeSerializable)SerializationUtils.clone(serializable);
Assert.assertEquals(input, clone.getInput());
(SampleNormalizedNodeSerializable)SerializationUtils.clone(serializable);
Assert.assertEquals(input, clone.getInput());
- @SuppressWarnings("deprecation")
@Test
public void testAnyXmlStreaming() throws Exception {
String xml = "<foo xmlns=\"http://www.w3.org/TR/html4/\" x=\"123\"><bar>one</bar><bar>two</bar></foo>";
@Test
public void testAnyXmlStreaming() throws Exception {
String xml = "<foo xmlns=\"http://www.w3.org/TR/html4/\" x=\"123\"><bar>one</bar><bar>two</bar></foo>";
Builders.anyXmlBuilder().withNodeIdentifier(new NodeIdentifier(TestModel.ANY_XML_QNAME))
.withValue(new DOMSource(xmlNode)).build()).build();
Builders.anyXmlBuilder().withNodeIdentifier(new NodeIdentifier(TestModel.ANY_XML_QNAME))
.withValue(new DOMSource(xmlNode)).build()).build();
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter(
- ByteStreams.newDataOutput(byteArrayOutputStream));
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ NormalizedNodeDataOutput nnout = NormalizedNodeInputOutput.newDataOutput(ByteStreams.newDataOutput(bos));
- writer.writeNormalizedNode(anyXmlContainer);
+ nnout.writeNormalizedNode(anyXmlContainer);
- NormalizedNodeInputStreamReader reader = new NormalizedNodeInputStreamReader(
- ByteStreams.newDataInput(byteArrayOutputStream.toByteArray()));
+ NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(
+ bos.toByteArray()));
- ContainerNode deserialized = (ContainerNode)reader.readNormalizedNode();
+ ContainerNode deserialized = (ContainerNode)nnin.readNormalizedNode();
Optional<DataContainerChild<? extends PathArgument, ?>> child =
deserialized.getChild(new NodeIdentifier(TestModel.ANY_XML_QNAME));
Optional<DataContainerChild<? extends PathArgument, ?>> child =
deserialized.getChild(new NodeIdentifier(TestModel.ANY_XML_QNAME));
assertEquals("XML", xml, xmlOutput.getWriter().toString());
assertEquals("http://www.w3.org/TR/html4/", ((AnyXmlNode)child.get()).getValue().getNode().getNamespaceURI());
assertEquals("XML", xml, xmlOutput.getWriter().toString());
assertEquals("http://www.w3.org/TR/html4/", ((AnyXmlNode)child.get()).getValue().getNode().getNamespaceURI());
+ @Test
+ public void testSchemaPathSerialization() throws Exception {
+ final SchemaPath expected = SchemaPath.create(true, TestModel.ANY_XML_QNAME);
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ NormalizedNodeDataOutput nnout = NormalizedNodeInputOutput.newDataOutput(ByteStreams.newDataOutput(bos));
+ nnout.writeSchemaPath(expected);
+
+ NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(ByteStreams.newDataInput(
+ bos.toByteArray()));
+ SchemaPath actual = nnin.readSchemaPath();
+ assertEquals(expected, actual);
}
private static String largeString(final int pow) {
}
private static String largeString(final int pow) {