Rename SodiumNormalizedNode* classes 07/84007/2
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 26 Aug 2019 22:08:05 +0000 (00:08 +0200)
committerRobert Varga <nite@hq.sk>
Sun, 22 Sep 2019 03:11:41 +0000 (03:11 +0000)
These are implementing Neon SR2 serialization format, hence they
should be named as such.

Change-Id: Iaa509e3490b420b8005a2724105bf99b53d95cf2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 013e3c18d3c48fa1d6c62d410bc1a9d94d2fb560)

opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NeonSR2NormalizedNodeInputStreamReader.java [moved from opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeInputStreamReader.java with 97% similarity]
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NeonSR2NormalizedNodeOutputStreamWriter.java [moved from opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeOutputStreamWriter.java with 95% similarity]
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeOutputStreamWriter.java
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/VersionedNormalizedNodeDataInput.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<NodeIdentifier> codedNodeIdentifiers = new ArrayList<>();
     private final List<AugmentationIdentifier> codedAugments = new ArrayList<>();
     private final List<QNameModule> codedModules = new ArrayList<>();
     private final List<QName> codedQNames = new ArrayList<>();
 
-    SodiumNormalizedNodeInputStreamReader(final DataInput input) {
+    NeonSR2NormalizedNodeInputStreamReader(final DataInput input) {
         super(input);
     }
 
@@ -29,12 +29,12 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.Augmentat
  * <p>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<AugmentationIdentifier, Integer> aidCodeMap = new HashMap<>();
     private final Map<QNameModule, Integer> moduleCodeMap = new HashMap<>();
     private final Map<QName, Integer> qnameCodeMap = new HashMap<>();
 
-    SodiumNormalizedNodeOutputStreamWriter(final DataOutput output) {
+    NeonSR2NormalizedNodeOutputStreamWriter(final DataOutput output) {
         super(output);
     }
 
index f7376189eea92ec10625311ea179d6273558edfa..7a8c267ad1abe23167f72ca7adc62bba90de545d 100644 (file)
@@ -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);
         }
index 3857634e8b384ab01f427d090176f335b1872578..84e7f335874f5ccf4b01d48e942da526a621e16d 100644 (file)
@@ -23,7 +23,7 @@ import java.io.DataOutput;
  * <p>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);
     }
index 6691a2f97b3b7cbaf1d6d4cf1b632e7430bc03e8..e58d229effe446f47eeef375881afc614cabc003 100644 (file)
@@ -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);