Merge pull request #237474 from pauljewellmsft/pauljewell-move-adls-samples

Move sample for restoring soft-deleted directory

Author: v-shils

articles/storage/blobs/data-lake-storage-directory-file-acl-dotnet.md

@@ -103,6 +103,22 @@ This example deletes a directory named `my-directory`.
 
 :::code language="csharp" source="~/azure-storage-snippets/blobs/howto/dotnet/dotnet-v12/CRUD_DataLake.cs" id="Snippet_DeleteDirectory":::
 
+## Restore a soft-deleted directory
+
+You can use the Azure Storage client libraries to restore a soft-deleted directory. Use the following method to list deleted paths for a [DataLakeFileSystemClient](/dotnet/api/azure.storage.files.datalake.datalakefilesystemclient) instance:
+
+- [GetDeletedPathsAsync](/dotnet/api/azure.storage.files.datalake.datalakefilesystemclient.getdeletedpathsasync)
+
+Use the following method to restore a soft-deleted directory:
+
+- [UndeletePathAsync](/dotnet/api/azure.storage.files.datalake.datalakefilesystemclient.undeletepathasync)
+
+The following code example shows how to list deleted paths and restore a soft-deleted directory:
+
+:::code language="csharp" source="~/azure-storage-snippets/blobs/howto/dotnet/dotnet-v12/CRUD_DataLake.cs" id="Snippet_RestoreDirectory":::
+
+If you rename the directory that contains the soft-deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to its original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft-deleted items.
+
 ## Upload a file to a directory
 
 First, create a file reference in the target directory by creating an instance of the [DataLakeFileClient](/dotnet/api/azure.storage.files.datalake.datalakefileclient) class. Upload a file by calling the [DataLakeFileClient.AppendAsync](/dotnet/api/azure.storage.files.datalake.datalakefileclient.appendasync) method. Make sure to complete the upload by calling the [DataLakeFileClient.FlushAsync](/dotnet/api/azure.storage.files.datalake.datalakefileclient.flushasync) method.

articles/storage/blobs/storage-blob-delete.md

@@ -52,7 +52,7 @@ To restore deleted blobs when versioning is not enabled, call either of the foll
 These methods restore soft-deleted blobs and any deleted snapshots associated with them. Calling either of these methods for a blob that has not been deleted has no effect. The following example restores  all soft-deleted blobs and their snapshots in a container:
 
 ```csharp
-public static async Task UnDeleteBlobs(BlobContainerClient container)
+public static async Task UndeleteBlobs(BlobContainerClient container)
 {
     foreach (BlobItem blob in container.GetBlobs(BlobTraits.None, BlobStates.Deleted))
     {
@@ -115,74 +115,6 @@ public static void RestoreBlobsWithVersioning(BlobContainerClient container, Blo
 }
 ```
 
-## Restore soft-deleted blobs and directories (hierarchical namespace)
-
-> [!IMPORTANT]
-> This section applies only to accounts that have a hierarchical namespace.
-
-1. Open a command prompt and change directory (`cd`) into your project folder For example:
-
-   ```console
-   cd myProject
-   ```
-
-2. Install the `Azure.Storage.Files.DataLake -v 12.7.0` version or greater of the [Azure.Storage.Files.DataLake](https://www.nuget.org/packages/Azure.Storage.Files.DataLake/) NuGet package by using the `dotnet add package` command.
-
-   ```console
-   dotnet add package Azure.Storage.Files.DataLake -v -v 12.7.0 -s https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
-   ```
-
-3. Then, add these using statements to the top of your code file.
-
-    ```csharp
-    using Azure;
-    using Azure.Storage;
-    using Azure.Storage.Files.DataLake;
-    using Azure.Storage.Files.DataLake.Models;
-    using NUnit.Framework;
-    using System;
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-    ```
-
-4. The following code deletes a directory, and then restores a soft-deleted directory.
-
-   This method assumes that you've created a [DataLakeServiceClient](/dotnet/api/azure.storage.files.datalake.datalakeserviceclient) instance. To learn how to create a [DataLakeServiceClient](/dotnet/api/azure.storage.files.datalake.datalakeserviceclient) instance, see [Connect to the account](data-lake-storage-directory-file-acl-dotnet.md#connect-to-the-account).
-
-   ```csharp
-      public void RestoreDirectory(DataLakeServiceClient serviceClient)
-      {
-          DataLakeFileSystemClient fileSystemClient =
-             serviceClient.GetFileSystemClient("my-container");
-
-          DataLakeDirectoryClient directory =
-              fileSystem.GetDirectoryClient("my-directory");
-
-          // Delete the Directory
-          await directory.DeleteAsync();
-
-          // List Deleted Paths
-          List<PathHierarchyDeletedItem> deletedItems = new List<PathHierarchyDeletedItem>();
-          await foreach (PathHierarchyDeletedItem deletedItem in fileSystemClient.GetDeletedPathsAsync())
-          {
-            deletedItems.Add(deletedItem);
-          }
-
-          Assert.AreEqual(1, deletedItems.Count);
-          Assert.AreEqual("my-directory", deletedItems[0].Path.Name);
-          Assert.IsTrue(deletedItems[0].IsPath);
-
-          // Restore deleted directory.
-          Response<DataLakePathClient> restoreResponse = await fileSystemClient.RestorePathAsync(
-          deletedItems[0].Path.Name,
-          deletedItems[0].Path.DeletionId);
-
-      }
-
-   ```
-
-   If you rename the directory that contains the soft-deleted items, those items become disconnected from the directory. If you want to restore those items, you'll have to revert the name of the directory back to its original name or create a separate directory that uses the original directory name. Otherwise, you'll receive an error when you attempt to restore those soft-deleted items.
-
 ## Resources
 
 To learn more about how to delete blobs and restore deleted blobs using the Azure Blob Storage client library for .NET, see the following resources.