This class is tied to NeonSR2 serialization format through subclassing,
where it really is a package-private detail. This leads to two concrete
classes being in existence for a particular format, which simply does
not make sense.
Eliminating this subclass allows us to make Neon SR2 final, thus arriving
and monomorphic or bimorphic invocation of all methods based on whether
we have seen Lithium (well, Oxygen) format at runtime.
Change-Id: I9e0463ec4879900e82cf757006dccfdbeb0d7297
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
68f179dcd8483dd7f681e134268a1eee29d09d55)
(cherry picked from commit
65f9a729fde4ad25cea4b81eede806a299e426b4)
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * NormalizedNodeOutputStreamWriter will be used by distributed datastore to send normalized node in
+ * a stream.
+ * A stream writer wrapper around this class will write node objects to stream in recursive manner.
+ * for example - If you have a ContainerNode which has a two LeafNode as children, then
+ * you will first call
+ * {@link #startContainerNode(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier, int)},
+ * then will call
+ * {@link #leafNode(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier, Object)} twice
+ * and then, {@link #endNode()} to end container node.
+ *
+ * <p>Based on the each node, the node type is also written to the stream, that helps in reconstructing the object,
+ * while reading.
+ */
abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOutput, NormalizedNodeStreamWriter {
private static final Logger LOG = LoggerFactory.getLogger(AbstractNormalizedNodeDataOutput.class);
* <p>Based on the each node, the node type is also written to the stream, that helps in reconstructing the object,
* while reading.
*/
-class LithiumNormalizedNodeOutputStreamWriter extends AbstractLithiumDataOutput {
+final class LithiumNormalizedNodeOutputStreamWriter extends AbstractLithiumDataOutput {
LithiumNormalizedNodeOutputStreamWriter(final DataOutput output) {
super(output);
}
@Override
- protected final short streamVersion() {
+ protected short streamVersion() {
return TokenTypes.LITHIUM_VERSION;
}
@Override
- protected final void writeQName(final QName qname) throws IOException {
+ protected void writeQName(final QName qname) throws IOException {
defaultWriteQName(qname);
}
@Override
- final void writeModule(final QNameModule module) throws IOException {
+ void writeModule(final QNameModule module) throws IOException {
defaultWriteModule(module);
}
}
* @return a new {@link NormalizedNodeDataOutput} instance
*/
public static NormalizedNodeDataOutput newDataOutput(final @NonNull DataOutput output) {
- return new NormalizedNodeOutputStreamWriter(output);
+ return new LithiumNormalizedNodeOutputStreamWriter(output);
}
/**
+++ /dev/null
-/*
- * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * 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 java.io.DataOutput;
-
-/**
- * NormalizedNodeOutputStreamWriter will be used by distributed datastore to send normalized node in
- * a stream.
- * A stream writer wrapper around this class will write node objects to stream in recursive manner.
- * for example - If you have a ContainerNode which has a two LeafNode as children, then
- * you will first call
- * {@link #startContainerNode(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier, int)},
- * then will call
- * {@link #leafNode(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier, Object)} twice
- * and then, {@link #endNode()} to end container node.
- *
- * <p>Based on the each node, the node type is also written to the stream, that helps in reconstructing the object,
- * while reading.
- */
-// FIXME: CONTROLLER-1888: switch this to Sodium once we have a corresponding datastore version
-class NormalizedNodeOutputStreamWriter extends LithiumNormalizedNodeOutputStreamWriter {
- NormalizedNodeOutputStreamWriter(final DataOutput output) {
- super(output);
- }
-}
public void testNormalizedNodeAndYangInstanceIdentifierStreaming() throws IOException {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- NormalizedNodeOutputStreamWriter writer = new NormalizedNodeOutputStreamWriter(
+ NormalizedNodeDataOutput writer = NormalizedNodeInputOutput.newDataOutput(
ByteStreams.newDataOutput(byteArrayOutputStream));
NormalizedNode<?, ?> testContainer = TestModel.createBaseTestContainerBuilder().build();
import java.io.ObjectOutputStream;
import java.io.Serializable;
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;
public class SampleNormalizedNodeSerializable implements Serializable {
private static final long serialVersionUID = 1L;
private NormalizedNode<?, ?> input;
- public SampleNormalizedNodeSerializable(NormalizedNode<?, ?> input) {
+ public SampleNormalizedNodeSerializable(final NormalizedNode<?, ?> input) {
this.input = input;
}
return input;
}
- private void readObject(final ObjectInputStream stream)
- throws IOException {
- NormalizedNodeDataInput reader = NormalizedNodeInputOutput.newDataInput(stream);
- this.input = reader.readNormalizedNode();
+ private void readObject(final ObjectInputStream stream) throws IOException {
+ this.input = NormalizedNodeInputOutput.newDataInput(stream).readNormalizedNode();
}
private void writeObject(final ObjectOutputStream stream) throws IOException {
- NormalizedNodeStreamWriter writer = new NormalizedNodeOutputStreamWriter(stream);
- NormalizedNodeWriter normalizedNodeWriter = NormalizedNodeWriter.forStreamWriter(writer);
-
- normalizedNodeWriter.write(this.input);
+ NormalizedNodeInputOutput.newDataOutput(stream).writeNormalizedNode(input);
}
}
Code Review / controller.git / commitdiff