X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fpersisted%2FShardDataTreeSnapshot.java;h=1dbab16c7ba118586040e196d43dc4cdeef636a8;hp=85d1143a891f743fdc652f1847f4b047c412e8aa;hb=ff818d5df82e34d0031289901e0335fe15c91303;hpb=094e21711bd90f8237da09cfc141fcf21dcba87b;ds=sidebyside

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java
index 85d1143a89..1dbab16c7b 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java
@@ -15,7 +15,6 @@ import java.io.InputStream;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import java.util.Optional;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,39 +34,19 @@ public abstract class ShardDataTreeSnapshot {
 
     @Deprecated
     public static ShardDataTreeSnapshot deserializePreCarbon(final byte[] bytes) throws IOException {
-        /**
-         * Unfortunately versions prior to Boron did not include any way to evolve the snapshot format and contained
-         * only the raw data stored in the datastore. Furthermore utilities involved do not check if the array is
-         * completely consumed, which has a nasty side-effect when coupled with the fact that PayloadVersion writes
-         * a short value.
-         *
-         * Since our versions fit into a single byte, we end up writing the 0 as the first byte, which would be
-         * interpreted as 'not present' by the old snapshot format, which uses writeBoolean/readBoolean. A further
-         * complication is that readBoolean interprets any non-zero value as true, hence we cannot use a wild value
-         * to cause it to fail.
-         */
-        if (isLegacyStream(bytes)) {
-            return deserializeLegacy(bytes);
-        }
-
-        try {
-            try (InputStream is = new ByteArrayInputStream(bytes)) {
-                try (DataInputStream dis = new DataInputStream(is)) {
-                    final ShardDataTreeSnapshot ret = AbstractVersionedShardDataTreeSnapshot.deserializePreCarbon(dis);
-
-                    // Make sure we consume all bytes, otherwise something went very wrong
-                    final int bytesLeft = dis.available();
-                    if (bytesLeft != 0) {
-                        throw new IOException("Deserialization left " + bytesLeft + " in the buffer");
-                    }
+        try (InputStream is = new ByteArrayInputStream(bytes)) {
+            try (DataInputStream dis = new DataInputStream(is)) {
+                final ShardDataTreeSnapshot ret = AbstractVersionedShardDataTreeSnapshot.deserializePreCarbon(dis);
+
+                // Make sure we consume all bytes, otherwise something went very wrong
+                final int bytesLeft = dis.available();
+                if (bytesLeft != 0) {
+                    throw new IOException("Deserialization left " + bytesLeft + " in the buffer");
+                }
 
 
-                    return ret;
-                }
+                return ret;
             }
-        } catch (IOException e) {
-            LOG.debug("Failed to deserialize versioned stream, attempting pre-Lithium ProtoBuf", e);
-            return deserializeLegacy(bytes);
         }
     }
 
@@ -92,29 +71,5 @@ public abstract class ShardDataTreeSnapshot {
     public abstract Optional<NormalizedNode<?, ?>> getRootNode();
 
     public abstract void serialize(ObjectOutput out) throws IOException;
-
-    @Deprecated
-    private static boolean isLegacyStream(final byte[] bytes) {
-        if (bytes.length < 2) {
-            // Versioned streams have at least two bytes
-            return true;
-        }
-
-        /*
-         * The stream could potentially be a versioned stream. Here we rely on the signature marker available
-         * in org.opendaylight.controller.cluster.datastore.node.utils.stream.TokenTypes.
-         *
-         * For an old stream to be this long, the first byte has to be non-zero and the second byte has to be 0xAB.
-         *
-         * For a versioned stream, that translates to at least version 427 -- giving us at least 421 further versions
-         * before this check breaks.
-         */
-        return bytes[0] != 0 && bytes[1] == (byte)0xAB;
-    }
-
-    @Deprecated
-    private static ShardDataTreeSnapshot deserializeLegacy(final byte[] bytes) {
-        return new PreBoronShardDataTreeSnapshot(SerializationUtils.deserializeNormalizedNode(bytes));
-    }
 }