Remove version from BlobSourceCheckpointData

sdk/storage/Azure.Storage.DataMovement.Blobs/src/BlobDestinationCheckpointData.cs

@@ -11,8 +11,10 @@
 
 namespace Azure.Storage.DataMovement.Blobs
 {
-    internal class BlobDestinationCheckpointData : BlobCheckpointData
+    internal class BlobDestinationCheckpointData : StorageResourceCheckpointData
     {
+        public int Version;
+
         /// <summary>
         /// The type of blob.
         /// </summary>
@@ -74,8 +76,8 @@ public BlobDestinationCheckpointData(
             AccessTier? accessTier,
             DataTransferProperty<Metadata> metadata,
             DataTransferProperty<Tags> tags)
-            : base(DataMovementBlobConstants.DestinationCheckpointData.SchemaVersion)
         {
+            Version = DataMovementBlobConstants.DestinationCheckpointData.SchemaVersion;
             BlobType = blobType;
             PreserveBlobType = blobType?.Preserve ?? true;
             BlobTypeValue = blobType?.Value != default ? blobType.Value : default;

sdk/storage/Azure.Storage.DataMovement.Blobs/src/BlobSourceCheckpointData.cs

@@ -2,42 +2,17 @@
 // Licensed under the MIT License.
 
 using System.IO;
-using Azure.Storage.Blobs.Models;
-using Azure.Storage.Common;
 
 namespace Azure.Storage.DataMovement.Blobs
 {
-    internal class BlobSourceCheckpointData : BlobCheckpointData
+    internal class BlobSourceCheckpointData : StorageResourceCheckpointData
     {
-        public BlobSourceCheckpointData()
-            : base(DataMovementBlobConstants.SourceCheckpointData.SchemaVersion)
-        {
-        }
-
-        public override int Length => DataMovementBlobConstants.SourceCheckpointData.DataSize;
+        public override int Length => 0;
 
         protected override void Serialize(Stream stream)
         {
-            Argument.AssertNotNull(stream, nameof(stream));
-            BinaryWriter writer = new BinaryWriter(stream);
-
-            // Version
-            writer.Write(Version);
         }
 
-        internal static BlobSourceCheckpointData Deserialize(Stream stream)
-        {
-            Argument.AssertNotNull(stream, nameof(stream));
-            BinaryReader reader = new BinaryReader(stream);
-
-            // Version
-            int version = reader.ReadInt32();
-            if (version != DataMovementBlobConstants.SourceCheckpointData.SchemaVersion)
-            {
-                throw Errors.UnsupportedJobSchemaVersionHeader(version.ToString());
-            }
-
-            return new BlobSourceCheckpointData();
-        }
+        internal static BlobSourceCheckpointData Deserialize(Stream stream) => new();
     }
 }

sdk/storage/Azure.Storage.DataMovement.Blobs/src/BlobsStorageResourceProvider.cs

@@ -236,7 +236,7 @@ private StorageResource FromTransferProperties(
             bool getSource,
             CancellationToken cancellationToken)
         {
-            BlobCheckpointData checkpointData = properties.GetCheckpointData(getSource);
+            StorageResourceCheckpointData checkpointData = properties.GetCheckpointData(getSource);
 
             ResourceType type = GetType(checkpointData, properties.IsContainer);
             Uri uri = getSource ? properties.SourceUri : properties.DestinationUri;
@@ -725,7 +725,7 @@ public StorageResource Rehydrate(
         }
         #endregion
 
-        private static ResourceType GetType(BlobCheckpointData checkpointData, bool isContainer)
+        private static ResourceType GetType(StorageResourceCheckpointData checkpointData, bool isContainer)
         {
             if (isContainer)
             {

sdk/storage/Azure.Storage.DataMovement.Blobs/src/DataMovementBlobConstants.cs

@@ -16,10 +16,7 @@ internal class ResourceId
 
         internal class SourceCheckpointData
         {
-            internal const int SchemaVersion = 2;
-
-            internal const int VersionIndex = 0;
-            internal const int DataSize = VersionIndex + IntSizeInBytes;
+            internal const int DataSize = 0;
         }
 
         internal class DestinationCheckpointData

sdk/storage/Azure.Storage.DataMovement.Blobs/src/DataMovementBlobsExtensions.cs

@@ -507,7 +507,7 @@ internal static PageBlobUploadPagesFromUriOptions ToUploadPagesFromUriOptions(
             };
         }
 
-        internal static BlobCheckpointData GetCheckpointData(this DataTransferProperties properties, bool isSource)
+        internal static StorageResourceCheckpointData GetCheckpointData(this DataTransferProperties properties, bool isSource)
         {
             if (isSource)
             {

sdk/storage/Azure.Storage.DataMovement.Blobs/tests/BlobSourceCheckpointDataTests.cs

@@ -2,10 +2,9 @@
 // Licensed under the MIT License.
 
 extern alias DMBlobs;
-extern alias BaseBlobs;
 
+using System;
 using System.IO;
-using BaseBlobs::Azure.Storage.Blobs.Models;
 using DMBlobs::Azure.Storage.DataMovement.Blobs;
 using NUnit.Framework;
 
@@ -17,25 +16,17 @@ public class BlobSourceCheckpointDataTests
         public void Ctor()
         {
             BlobSourceCheckpointData data = new();
-
-            Assert.AreEqual(DataMovementBlobConstants.SourceCheckpointData.SchemaVersion, data.Version);
         }
 
         [Test]
         public void Serialize()
         {
-            BlobSourceCheckpointData data = new();
+            byte[] expected = Array.Empty<byte>();
 
-            byte[] expected;
-            using (MemoryStream stream = new MemoryStream(DataMovementBlobConstants.SourceCheckpointData.DataSize))
-            {
-                BinaryWriter writer = new BinaryWriter(stream);
-                writer.Write(DataMovementBlobConstants.SourceCheckpointData.SchemaVersion);
-                expected = stream.ToArray();
-            }
+            BlobSourceCheckpointData data = new();
 
             byte[] actual;
-            using (MemoryStream stream = new MemoryStream(DataMovementBlobConstants.SourceCheckpointData.DataSize))
+            using (MemoryStream stream = new())
             {
                 data.Serialize(stream);
                 actual = stream.ToArray();
@@ -45,20 +36,13 @@ public void Serialize()
         }
 
         [Test]
-        [TestCase(BlobType.Block)]
-        [TestCase(BlobType.Page)]
-        [TestCase(BlobType.Append)]
-        public void Deserialize(BlobType blobType)
+        public void Deserialize()
         {
-            BlobSourceCheckpointData data = new();
+            BlobSourceCheckpointData deserialized;
 
-            using (Stream stream = new MemoryStream(DataMovementBlobConstants.SourceCheckpointData.DataSize))
+            using (MemoryStream stream = new())
             {
-                data.Serialize(stream);
-                stream.Position = 0;
-                BlobSourceCheckpointData deserialized = BlobSourceCheckpointData.Deserialize(stream);
-
-                Assert.AreEqual(DataMovementBlobConstants.SourceCheckpointData.SchemaVersion, deserialized.Version);
+                deserialized = BlobSourceCheckpointData.Deserialize(Stream.Null);
             }
         }
     }

sdk/storage/Azure.Storage.DataMovement.Blobs/tests/RehydrateBlobResourceTests.cs

@@ -77,7 +77,7 @@ private static BlobDestinationCheckpointData GetDefaultDestinationCheckpointData
             default,
             default);
 
-        private static byte[] GetBytes(BlobCheckpointData checkpointData)
+        private static byte[] GetBytes(StorageResourceCheckpointData checkpointData)
         {
             using (MemoryStream stream = new MemoryStream())
             {