Renamed Azure.Storage.DataMovement.JobPlanModels to Models.JobPlan (Azure#35456)

amnguye · web-flow · commit 3736b087382e · 2023-04-10T15:00:59.000-07:00
diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/Azure.Storage.DataMovement.Blobs.Tests.csproj b/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/Azure.Storage.DataMovement.Blobs.Tests.csproj
@@ -14,7 +14,7 @@
     <Compile Include="$(AzureStorageDataMovementTestSharedSources)DisposingLocalDirectory.cs" LinkBase="Shared\DataMovement" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="$(AzureStorageDataMovementSharedSources)..\JobPlanModels\*.cs" LinkBase="Shared\DataMovement\JobPlanModels" />
+    <Compile Include="$(AzureStorageDataMovementSharedSources)..\Models\JobPlan\*.cs" LinkBase="Shared\DataMovement\JobPlanModels" />
     <Compile Include="$(AzureStorageDataMovementSharedSources)DataMovementExtensions.cs" LinkBase="Shared\DataMovement" />
   </ItemGroup>
   <ItemGroup>
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/JobPartInternal.cs b/sdk/storage/Azure.Storage.DataMovement/src/JobPartInternal.cs
@@ -9,8 +9,8 @@
 using System.Threading.Tasks;
 using Azure.Core;
 using Azure.Storage.DataMovement.Models;
-using Azure.Storage.DataMovement.JobPlanModels;
 using System.Linq;
+using Azure.Storage.DataMovement.Models.JobPlan;
 
 namespace Azure.Storage.DataMovement
 {
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/JobPlanExtensions.cs b/sdk/storage/Azure.Storage.DataMovement/src/JobPlanExtensions.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using System.IO.MemoryMappedFiles;
 using System.Threading.Tasks;
-using Azure.Storage.DataMovement.JobPlanModels;
+using Azure.Storage.DataMovement.Models.JobPlan;
 
 namespace Azure.Storage.DataMovement
 {
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/LocalTransferCheckpointer.cs b/sdk/storage/Azure.Storage.DataMovement/src/LocalTransferCheckpointer.cs
@@ -9,7 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.Storage.DataMovement.JobPlanModels;
+using Azure.Storage.DataMovement.Models.JobPlan;
 
 namespace Azure.Storage.DataMovement
 {
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/FolderPropertiesMode.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/FolderPropertiesMode.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     /// <summary>
     /// SMB Feature whether to preserve permissions on the folder
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobChunkPlanBody.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobChunkPlanBody.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 using System.Runtime.InteropServices;
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     [StructLayout(LayoutKind.Sequential)]
     internal struct JobChunkPlanBody
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartDeleteSnapshotsOption.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartDeleteSnapshotsOption.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     /// <summary>
     /// Required if the blob has associated snapshots. Specify one of the following two options:
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPermanentDeleteOption.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPermanentDeleteOption.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     /// <summary>
     /// Permanent Delete Options
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanBlockBlobTier.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanBlockBlobTier.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-namespace Azure.Storage.DataMovement.JobPlanModels
+
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     internal enum JobPartPlanBlockBlobTier
     {
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanCredentialType.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanCredentialType.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-namespace Azure.Storage.DataMovement.JobPlanModels
+
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     internal enum JobPartPlanCredentialType
     {
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanDestinationBlob.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanDestinationBlob.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 using System.Collections.Generic;
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     /// <summary>
     /// Describes the structure of a destination blob.
@@ -168,7 +168,7 @@ public JobPartPlanDestinationBlob(
             JobPartPlanBlockBlobTier blockBlobTier,
             JobPartPlanPageBlobTier pageBlobTier,
             bool putMd5,
-            IDictionary<string,string> metadata,
+            IDictionary<string, string> metadata,
             IDictionary<string, string> blobTags,
             bool isSourceEncrypted,
             string cpkScopeInfo,
@@ -306,7 +306,7 @@ private static string DictionaryToString(IDictionary<string, string> dict)
             foreach (KeyValuePair<string, string> kv in dict)
             {
                 // e.g. store like "header=value;"
-                concatStr = string.Concat(concatStr,$"{kv.Key}={kv.Value};");
+                concatStr = string.Concat(concatStr, $"{kv.Key}={kv.Value};");
             }
             return concatStr;
         }
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanDestinationLocal.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanDestinationLocal.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     /// <summary>
     /// This matching the JobPartPlanDstLocal of azcopy
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanFile.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanFile.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using Azure.Core;
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     internal class JobPartPlanFile : IDisposable
     {
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanFileName.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanFileName.cs
@@ -6,7 +6,7 @@
 using System.IO;
 using Azure.Core;
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     /// <summary>
     /// Saved Job Part Plan File
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanHeader.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanHeader.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using Azure.Core;
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     /// <summary>
     /// Stores the Job Part Header information to resume from.
@@ -847,7 +847,7 @@ private static void WriteString(BinaryWriter writer, string value, int setSizeIn
         {
             writer.Write(value.ToCharArray());
 
-            int padding =  setSizeInBytes - value.Length;
+            int padding = setSizeInBytes - value.Length;
             if (padding > 0)
             {
                 char[] paddingArray = new char[padding];
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanPageBlobTier.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanPageBlobTier.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-namespace Azure.Storage.DataMovement.JobPlanModels
+
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     internal enum JobPartPlanPageBlobTier
     {
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanRehydratePriorityType.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPartPlanRehydratePriorityType.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     internal enum JobPartPlanRehydratePriorityType
     {
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPlanBlobType.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPlanBlobType.cs
@@ -1,6 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-namespace Azure.Storage.DataMovement.JobPlanModels
+
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     internal enum JobPlanBlobType
     {
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPlanOperation.cs b/sdk/storage/Azure.Storage.DataMovement/src/Models/JobPlan/JobPlanOperation.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-namespace Azure.Storage.DataMovement.JobPlanModels
+namespace Azure.Storage.DataMovement.Models.JobPlan
 {
     internal enum JobPlanOperation
     {
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/TransferCheckpointer.cs b/sdk/storage/Azure.Storage.DataMovement/src/TransferCheckpointer.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Azure.Storage.DataMovement.JobPlanModels;
+using Azure.Storage.DataMovement.Models.JobPlan;
 
 namespace Azure.Storage.DataMovement
 {
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/JobPartPlanFileNameTests.cs b/sdk/storage/Azure.Storage.DataMovement/tests/JobPartPlanFileNameTests.cs
@@ -4,9 +4,9 @@
 using System;
 using NUnit.Framework;
 using Azure.Storage.Test;
-using Azure.Storage.DataMovement.JobPlanModels;
 using System.IO;
 using Azure.Core.TestFramework;
+using Azure.Storage.DataMovement.Models.JobPlan;
 
 namespace Azure.Storage.DataMovement.Tests
 {
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/JobPartPlanFileTests.cs b/sdk/storage/Azure.Storage.DataMovement/tests/JobPartPlanFileTests.cs
@@ -4,8 +4,8 @@
 using System.IO;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using Azure.Storage.DataMovement.JobPlanModels;
 using Azure.Core.TestFramework;
+using Azure.Storage.DataMovement.Models.JobPlan;
 
 namespace Azure.Storage.DataMovement.Tests
 {
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/JobPartPlanHeaderTests.cs b/sdk/storage/Azure.Storage.DataMovement/tests/JobPartPlanHeaderTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Azure.Storage.DataMovement.JobPlanModels;
+using Azure.Storage.DataMovement.Models.JobPlan;
 using NUnit.Framework;
 
 namespace Azure.Storage.DataMovement.Tests
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/LocalTransferCheckpointerTests.cs b/sdk/storage/Azure.Storage.DataMovement/tests/LocalTransferCheckpointerTests.cs
@@ -9,8 +9,8 @@
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Azure.Storage.DataMovement.Models;
-using Azure.Storage.DataMovement.JobPlanModels;
 using Azure.Core.TestFramework;
+using Azure.Storage.DataMovement.Models.JobPlan;
 
 namespace Azure.Storage.DataMovement.Tests
 {
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/PauseResumeTransferTests.cs b/sdk/storage/Azure.Storage.DataMovement/tests/PauseResumeTransferTests.cs
@@ -10,7 +10,7 @@
 using Azure.Storage.DataMovement.Blobs;
 using Azure.Storage.DataMovement.Models;
 using NUnit.Framework;
-using Azure.Storage.DataMovement.JobPlanModels;
+using Azure.Storage.DataMovement.Models.JobPlan;
 
 namespace Azure.Storage.DataMovement.Tests
 {
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/DataMovementBlobTestBase.cs b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/DataMovementBlobTestBase.cs
@@ -18,9 +18,6 @@
 using System.Threading;
 using Azure.Storage.Blobs.Tests;
 using Azure.Storage.Shared;
-using Azure.Storage.DataMovement.JobPlanModels;
-using System.Drawing;
-using Azure.Storage.DataMovement.Models;
 
 namespace Azure.Storage.DataMovement.Tests
 {
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/DataMovementTestBase.cs b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/DataMovementTestBase.cs
@@ -7,9 +7,9 @@
 using System.IO;
 using System.Collections.Generic;
 using System;
-using Azure.Storage.DataMovement.JobPlanModels;
 using Azure.Storage.Test;
 using System.Threading.Tasks;
+using Azure.Storage.DataMovement.Models.JobPlan;
 
 namespace Azure.Storage.DataMovement.Tests
 {

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@`
`9`	`9`	`using System.Threading.Tasks;`
`10`	`10`	`using Azure.Core;`
`11`	`11`	`using Azure.Storage.DataMovement.Models;`
`12`		`-using Azure.Storage.DataMovement.JobPlanModels;`
`13`	`12`	`using System.Linq;`
	`13`	`+using Azure.Storage.DataMovement.Models.JobPlan;`
`14`	`14`
`15`	`15`	`namespace Azure.Storage.DataMovement`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.IO.MemoryMappedFiles;`
`7`	`7`	`using System.Threading.Tasks;`
`8`		`-using Azure.Storage.DataMovement.JobPlanModels;`
	`8`	`+using Azure.Storage.DataMovement.Models.JobPlan;`
`9`	`9`
`10`	`10`	`namespace Azure.Storage.DataMovement`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`using System.Threading;`
`10`	`10`	`using System.Threading.Tasks;`
`11`	`11`	`using Azure.Core;`
`12`		`-using Azure.Storage.DataMovement.JobPlanModels;`
	`12`	`+using Azure.Storage.DataMovement.Models.JobPlan;`
`13`	`13`
`14`	`14`	`namespace Azure.Storage.DataMovement`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`		`-namespace Azure.Storage.DataMovement.JobPlanModels`
	`4`	`+namespace Azure.Storage.DataMovement.Models.JobPlan`
`5`	`5`	`{`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// SMB Feature whether to preserve permissions on the folder`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`	`using System.Runtime.InteropServices;`
`4`	`4`
`5`		`-namespace Azure.Storage.DataMovement.JobPlanModels`
	`5`	`+namespace Azure.Storage.DataMovement.Models.JobPlan`
`6`	`6`	`{`
`7`	`7`	`[StructLayout(LayoutKind.Sequential)]`
`8`	`8`	`internal struct JobChunkPlanBody`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License.`
`3`		`-namespace Azure.Storage.DataMovement.JobPlanModels`
	`3`	`+`
	`4`	`+namespace Azure.Storage.DataMovement.Models.JobPlan`
`4`	`5`	`{`
`5`	`6`	`internal enum JobPartPlanBlockBlobTier`
`6`	`7`	`{`