From 013e3c18d3c48fa1d6c62d410bc1a9d94d2fb560 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 27 Aug 2019 00:08:05 +0200 Subject: [PATCH] Rename SodiumNormalizedNode* classes These are implementing Neon SR2 serialization format, hence they should be named as such. Change-Id: Iaa509e3490b420b8005a2724105bf99b53d95cf2 Signed-off-by: Robert Varga --- ...eader.java => NeonSR2NormalizedNodeInputStreamReader.java} | 4 ++-- ...iter.java => NeonSR2NormalizedNodeOutputStreamWriter.java} | 4 ++-- .../node/utils/stream/NormalizedNodeInputOutput.java | 2 +- .../node/utils/stream/NormalizedNodeOutputStreamWriter.java | 2 +- .../node/utils/stream/VersionedNormalizedNodeDataInput.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/{SodiumNormalizedNodeInputStreamReader.java => NeonSR2NormalizedNodeInputStreamReader.java} (97%) rename opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/{SodiumNormalizedNodeOutputStreamWriter.java => NeonSR2NormalizedNodeOutputStreamWriter.java} (95%) diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeInputStreamReader.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NeonSR2NormalizedNodeInputStreamReader.java similarity index 97% rename from opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeInputStreamReader.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NeonSR2NormalizedNodeInputStreamReader.java index dc39c91ec2..a18124b05c 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeInputStreamReader.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NeonSR2NormalizedNodeInputStreamReader.java @@ -19,13 +19,13 @@ import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; -final class SodiumNormalizedNodeInputStreamReader extends LithiumNormalizedNodeInputStreamReader { +final class NeonSR2NormalizedNodeInputStreamReader extends LithiumNormalizedNodeInputStreamReader { private final ArrayList codedNodeIdentifiers = new ArrayList<>(); private final List codedAugments = new ArrayList<>(); private final List codedModules = new ArrayList<>(); private final List codedQNames = new ArrayList<>(); - SodiumNormalizedNodeInputStreamReader(final DataInput input) { + NeonSR2NormalizedNodeInputStreamReader(final DataInput input) { super(input); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeOutputStreamWriter.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NeonSR2NormalizedNodeOutputStreamWriter.java similarity index 95% rename from opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeOutputStreamWriter.java rename to opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NeonSR2NormalizedNodeOutputStreamWriter.java index 0f35132bda..e25aab5a72 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeOutputStreamWriter.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NeonSR2NormalizedNodeOutputStreamWriter.java @@ -29,12 +29,12 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.Augmentat *

Based on the each node, the node type is also written to the stream, that helps in reconstructing the object, * while reading. */ -class SodiumNormalizedNodeOutputStreamWriter extends LithiumNormalizedNodeOutputStreamWriter { +class NeonSR2NormalizedNodeOutputStreamWriter extends LithiumNormalizedNodeOutputStreamWriter { private final Map aidCodeMap = new HashMap<>(); private final Map moduleCodeMap = new HashMap<>(); private final Map qnameCodeMap = new HashMap<>(); - SodiumNormalizedNodeOutputStreamWriter(final DataOutput output) { + NeonSR2NormalizedNodeOutputStreamWriter(final DataOutput output) { super(output); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java index f7376189ee..7a8c267ad1 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java @@ -66,7 +66,7 @@ public final class NormalizedNodeInputOutput { case LITHIUM: return new LithiumNormalizedNodeOutputStreamWriter(output); case NEON_SR2: - return new SodiumNormalizedNodeOutputStreamWriter(output); + return new NeonSR2NormalizedNodeOutputStreamWriter(output); default: throw new IllegalStateException("Unhandled version " + version); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java index 3857634e8b..84e7f33587 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java @@ -23,7 +23,7 @@ import java.io.DataOutput; *

Based on the each node, the node type is also written to the stream, that helps in reconstructing the object, * while reading. */ -class NormalizedNodeOutputStreamWriter extends SodiumNormalizedNodeOutputStreamWriter { +class NormalizedNodeOutputStreamWriter extends NeonSR2NormalizedNodeOutputStreamWriter { NormalizedNodeOutputStreamWriter(final DataOutput output) { super(output); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/VersionedNormalizedNodeDataInput.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/VersionedNormalizedNodeDataInput.java index 6691a2f97b..e58d229eff 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/VersionedNormalizedNodeDataInput.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/VersionedNormalizedNodeDataInput.java @@ -38,7 +38,7 @@ final class VersionedNormalizedNodeDataInput extends ForwardingNormalizedNodeDat ret = new LithiumNormalizedNodeInputStreamReader(input); break; case TokenTypes.NEON_SR2_VERSION: - ret = new SodiumNormalizedNodeInputStreamReader(input); + ret = new NeonSR2NormalizedNodeInputStreamReader(input); break; default: throw defunct("Unhandled stream version %s", version); -- 2.36.6