Rename SODIUM versions to NEON_SR2

We are shipping these improvements in Neon SR2, which means we
should reserve this version not as Sodium.

Change-Id: If5caa0dd7510c6e1ffe3c483c74c456798ca6bb3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java
index bcb4cbf16f569c3584f10e28d04a6b88059162c1..f7376189eea92ec10625311ea179d6273558edfa 100644 (file)
--- a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java
+++ b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeInputOutput.java
@@ -65,7 +65,7 @@ public final class NormalizedNodeInputOutput {
         switch (version) {
             case LITHIUM:
                 return new LithiumNormalizedNodeOutputStreamWriter(output);
-            case SODIUM:
+            case NEON_SR2:
                 return new SodiumNormalizedNodeOutputStreamWriter(output);
             default:
                 throw new IllegalStateException("Unhandled version " + version);

diff --git a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamVersion.java b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamVersion.java
index 97d0f04b363524e01e7d1164ac70ec5baf2dba21..a2b04c3255982547c0c39cd531271b02295cc29d 100644 (file)
--- a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamVersion.java
+++ b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/NormalizedNodeStreamVersion.java
@@ -17,5 +17,5 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 @NonNullByDefault
 public enum NormalizedNodeStreamVersion {
     LITHIUM,
-    SODIUM;
+    NEON_SR2;
 }

diff --git a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeInputStreamReader.java b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeInputStreamReader.java
index ac5d9fdd787f259b0b5c062a14810c2d72779c4a..dc39c91ec2d17799be27fb259ffebe28bc77c4ec 100644 (file)
--- a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeInputStreamReader.java
+++ b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeInputStreamReader.java
@@ -31,7 +31,7 @@ final class SodiumNormalizedNodeInputStreamReader extends LithiumNormalizedNodeI
 
     @Override
     public NormalizedNodeStreamVersion getVersion() throws IOException {
-        return NormalizedNodeStreamVersion.SODIUM;
+        return NormalizedNodeStreamVersion.NEON_SR2;
     }
 
     @Override

diff --git a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeOutputStreamWriter.java b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeOutputStreamWriter.java
index 26a6613fdc7b5acb4cb33d6cc78ddbdf3a6c10bc..0f35132bda3a105fdd3606b44ade7bce44b92ca4 100644 (file)
--- a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeOutputStreamWriter.java
+++ b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/SodiumNormalizedNodeOutputStreamWriter.java
@@ -40,7 +40,7 @@ class SodiumNormalizedNodeOutputStreamWriter extends LithiumNormalizedNodeOutput
 
     @Override
     protected short streamVersion() {
-        return TokenTypes.SODIUM_VERSION;
+        return TokenTypes.NEON_SR2_VERSION;
     }
 
     @Override

diff --git a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/TokenTypes.java b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/TokenTypes.java
index 5fa9ce97b9d638daf8c58f227acf0ac6a1227c69..66405b1340020dc1774abf47909f4d3695b17208 100644 (file)
--- a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/TokenTypes.java
+++ b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/TokenTypes.java
@@ -22,14 +22,14 @@ final class TokenTypes {
      * Revised stream version. Unlike {@link #LITHIUM_VERSION}, QNames and QNameModules are using a per-stream
      * dictionary, too.
      */
-    static final short SODIUM_VERSION = 2;
+    static final short NEON_SR2_VERSION = 2;
 
     // Tokens supported in LITHIUM_VERSION
     static final byte IS_CODE_VALUE = 1;
     static final byte IS_STRING_VALUE = 2;
     static final byte IS_NULL_VALUE = 3;
 
-    // Tokens supported in SODIUM_VERSION
+    // Tokens supported in NEON_SR2_VERSION
     static final byte IS_QNAME_CODE = 4;
     static final byte IS_QNAME_VALUE = 5;
     static final byte IS_AUGMENT_CODE = 6;

diff --git a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/VersionedNormalizedNodeDataInput.java b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/VersionedNormalizedNodeDataInput.java
index 9e7bbdc19b7b08a2e9ef6a3734b512e85e86e02c..6691a2f97b3b7cbaf1d6d4cf1b632e7430bc03e8 100644 (file)
--- a/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/VersionedNormalizedNodeDataInput.java
+++ b/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/VersionedNormalizedNodeDataInput.java
@@ -37,7 +37,7 @@ final class VersionedNormalizedNodeDataInput extends ForwardingNormalizedNodeDat
             case TokenTypes.LITHIUM_VERSION:
                 ret = new LithiumNormalizedNodeInputStreamReader(input);
                 break;
-            case TokenTypes.SODIUM_VERSION:
+            case TokenTypes.NEON_SR2_VERSION:
                 ret = new SodiumNormalizedNodeInputStreamReader(input);
                 break;
             default: