Fixed review comments

Author: rambabu-yalla

src/Sql/Sql/Server/Cmdlet/NewAzureSqlServer.cs

@@ -189,7 +189,7 @@ public override void ExecuteCmdlet()
             }
 
             // SoftDeleteRetentionDays depends on EnableSoftDeleteRetention; if days are provided but soft-delete is not enabled, fail early.
-            if (this.SoftDeleteRetentionDays.HasValue && this.SoftDeleteRetentionDays > 0 && !this.EnableSoftDeleteRetention)
+            if (this.SoftDeleteRetentionDays.HasValue && !this.EnableSoftDeleteRetention)
             {
                 throw new PSArgumentException(Properties.Resources.MissingEnableSoftDeleteRetention, "EnableSoftDeleteRetention");
             }

src/Sql/Sql/Server/Cmdlet/RestoreAzureSqlServer.cs

@@ -58,8 +58,7 @@ public class RestoreAzureSqlServer : AzureSqlServerCmdletBase
             // First check if a live server already exists
             try
             {
-                bool serverExists = ModelAdapter.ListServers().Any(s =>
-                    string.Equals(s.ResourceGroupName, this.ResourceGroupName, StringComparison.OrdinalIgnoreCase) &&
+                bool serverExists = ModelAdapter.ListServersByResourceGroup(this.ResourceGroupName).Any(s =>
                     string.Equals(s.ServerName, this.ServerName, StringComparison.OrdinalIgnoreCase));
 
                 if (serverExists)
@@ -83,8 +82,7 @@ public class RestoreAzureSqlServer : AzureSqlServerCmdletBase
             // Now check if there's a deleted server to restore
             try
             {
-                var deletedServer = ModelAdapter.GetDeletedServer(this.ResourceGroupName, this.ServerName);
-                if (deletedServer == null)
+                if (ModelAdapter.GetDeletedServer(this.Location, this.ServerName) == null)
                 {
                    throw new PSArgumentException(
                        string.Format(Properties.Resources.DeletedServerNotFound,
@@ -117,20 +115,16 @@ public class RestoreAzureSqlServer : AzureSqlServerCmdletBase
         /// <returns>The generated model from user input</returns>
         protected override IEnumerable<Model.AzureSqlServerModel> ApplyUserInputToModel(IEnumerable<Model.AzureSqlServerModel> model)
         {
-            if (!Sql.Services.Util.ValidateServerName(this.ServerName))
+            return new List<Model.AzureSqlServerModel>
             {
-                throw new PSArgumentException(string.Format(Properties.Resources.ServerNameInvalid, this.ServerName), "ServerName");
-            }
-
-            List<Model.AzureSqlServerModel> newEntity = new List<Model.AzureSqlServerModel>();
-            newEntity.Add(new Model.AzureSqlServerModel()
-            {
-                Location = this.Location,
-                ResourceGroupName = this.ResourceGroupName,
-                ServerName = this.ServerName,
-                CreateMode = "Restore"
-            });
-            return newEntity;
+                new Model.AzureSqlServerModel
+                {
+                    Location = this.Location,
+                    ResourceGroupName = this.ResourceGroupName,
+                    ServerName = this.ServerName,
+                    CreateMode = "Restore"
+                }
+            };
         }
 
         /// <summary>

src/Sql/Sql/Server/Cmdlet/SetAzureSqlServer.cs

@@ -131,7 +131,7 @@ public class SetAzureSqlServer : AzureSqlServerCmdletBase
         [Parameter(Mandatory = false,
             HelpMessage = "Specify whether to enable soft-delete retention for the server. When enabled, a dropped server can be restored within the retention window (defaults to 7 days if not specified). To set a custom retention period use -SoftDeleteRetentionDays.")]
         [PSArgumentCompleter("true", "false")]
-        public bool EnableSoftDeleteRetention { get; set; } = false;
+        public bool EnableSoftDeleteRetention { get; set; }
 
         /// <summary>
         /// Value for soft-delete retention days for the server.

src/Sql/Sql/Server/Services/AzureSqlServerAdapter.cs

@@ -412,16 +412,17 @@ protected Guid GetTenantId()
 
             return tenantIdGuid;
         }
+
         /// <summary>
-        /// Gets a deleted server in a resource group
+        /// Gets a deleted Azure SQL server by location and server name.
         /// </summary>
-        /// <param name="resourceGroupName">The name of the resource group</param>
-        /// <param name="serverName">The name of the deleted server</param>
-        /// <param name="subscriptionId">The subscription id of the server.</param>
-        /// <returns>The deleted server information</returns>
-        public Management.Sql.Models.DeletedServer GetDeletedServer(string resourceGroupName, string serverName, string subscriptionId = null)
+        /// <param name="location">The Azure region (location) where the deleted server resided.</param>
+        /// <param name="serverName">The name of the deleted SQL server.</param>
+        /// <param name="subscriptionId">Optional. The subscription ID associated with the server. If null, uses the current context.</param>
+        /// <returns>The deleted server information if found; otherwise, null.</returns>
+        public Management.Sql.Models.DeletedServer GetDeletedServer(string location, string serverName, string subscriptionId = null)
         {
-            return Communicator.GetDeleted(resourceGroupName, serverName, subscriptionId);
+            return Communicator.GetDeleted(location, serverName, subscriptionId);
         }
     }
 }

src/Sql/Sql/Server/Services/AzureSqlServerCommunicator.cs

@@ -97,9 +97,9 @@ public void Remove(string resourceGroupName, string serverName)
         /// <summary>
         /// Gets the deleted Azure Sql Database Server
         /// </summary>
-        public Management.Sql.Models.DeletedServer GetDeleted(string resourceGroupName, string serverName, string subscriptionId = null)
+        public Management.Sql.Models.DeletedServer GetDeleted(string location, string serverName, string subscriptionId = null)
         {
-            return GetCurrentSqlClient(subscriptionId).DeletedServers.Get(resourceGroupName, serverName);
+            return GetCurrentSqlClient(subscriptionId).DeletedServers.Get(location, serverName);
         }
 
         /// <summary>

src/Sql/Sql/help/Restore-AzSqlServer.md

@@ -44,7 +44,7 @@ RestrictOutboundNetworkAccess : Disabled
 Administrators                :
 PrimaryUserAssignedIdentityId :
 KeyId                         :
-FederatedClientId             : 
+FederatedClientId             :
 SoftDeleteRetentionDays       : 7
 ```
 

src/Sql/Sql/help/Set-AzSqlServer.md

@@ -118,7 +118,7 @@ Accept wildcard characters: False
 ```
 
 ### -EnableSoftDeleteRetention
-Boolean value for whether or not to enable soft-delete for the server such that the server can be restored for a default of 7 days after dropping. If you want to specify a different retention period, use the RetentionDays parameter.
+Boolean value for whether or not to enable soft-delete for the server such that the server can be restored for a default of 7 days after dropping. If you want to specify a different retention period, use the SoftDeleteRetentionDays parameter.
 
 ```yaml
 Type: System.Boolean
@@ -301,7 +301,7 @@ Accept wildcard characters: False
 ```
 
 ### -SoftDeleteRetentionDays
-Value for soft-delete retention days for the server such that the server can be restored for the specified number of days after dropping. Only valid values are from 0 to 35. If set to 0, soft-delete retention is disabled.
+Value for soft-delete retention days for the server such that the server can be restored for the specified number of days after dropping. Only valid values are from 0-35. If set to 0, soft-delete retention is disabled.
 
 ```yaml
 Type: System.Nullable`1[System.Int32]