RavenDB-17793 : address minor PR comments

aviv86 · Jul 3, 2024 · c22e059 · c22e059
1 parent 72ccf9c
commit c22e059
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/Raven.Server/Documents/Handlers/Admin/AdminShardingHandler.cs b/src/Raven.Server/Documents/Handlers/Admin/AdminShardingHandler.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Net;
 using System.Threading.Tasks;
-using Raven.Client.Exceptions.Sharding;
 using Raven.Server.Documents.Sharding;
 using Raven.Server.Routing;
 using Raven.Server.Utils;
@@ -26,19 +25,19 @@ public async Task ExecuteMoveDocuments()
         [RavenAction("/databases/*/admin/sharding/prefixed", "PUT", AuthorizationStatus.DatabaseAdmin)]
         public Task AddPrefixedShardingSetting()
         {
-            throw new NotSupportedInShardingException("This operation is not available from a specific shard");
+            throw new NotSupportedException("This operation is not available from a specific shard");
         }
 
         [RavenAction("/databases/*/admin/sharding/prefixed", "DELETE", AuthorizationStatus.DatabaseAdmin)]
         public Task DeletePrefixedShardingSetting()
         {
-            throw new NotSupportedInShardingException("This operation is not available from a specific shard");
+            throw new NotSupportedException("This operation is not available from a specific shard");
         }
 
         [RavenAction("/databases/*/admin/sharding/prefixed", "POST", AuthorizationStatus.DatabaseAdmin)]
         public Task UpdatePrefixedShardingSetting()
         {
-            throw new NotSupportedInShardingException("This operation is not available from a specific shard");
+            throw new NotSupportedException("This operation is not available from a specific shard");
         }
 
         private void ValidateShardDatabaseName()

diff --git a/src/Raven.Server/Documents/Sharding/Handlers/Admin/ShardedAdminShardingHandler.cs b/src/Raven.Server/Documents/Sharding/Handlers/Admin/ShardedAdminShardingHandler.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Threading.Tasks;
 using Raven.Client.Documents.Commands;
 using Raven.Client.Documents.Conventions;
@@ -53,7 +52,7 @@ public async Task AddPrefixedShardingSetting()
                     urls = shardingConfiguration.Orchestrator.Topology.Members.Select(clusterTopology.GetUrlFromTag).ToArray();
                 }
 
-                if (await AssertNoDocumentsStartingWith(context, setting.Prefix, urls) == false)
+                if (await AssertNoDocumentsStartingWithAsync(context, setting.Prefix, urls) == false)
                     throw new InvalidOperationException(
                         $"Cannot add prefix '{setting.Prefix}' to {nameof(ShardingConfiguration)}.{nameof(ShardingConfiguration.Prefixed)}. " +
                         $"There are existing documents in database '{DatabaseName}' that start with '{setting.Prefix}'. " +
@@ -63,8 +62,8 @@ public async Task AddPrefixedShardingSetting()
                 var (raftIndex, _) = await ServerStore.SendToLeaderAsync(cmd);
 
                 await DatabaseContext.ServerStore.WaitForExecutionOnRelevantNodesAsync(context, shardingConfiguration.Orchestrator.Topology.Members, raftIndex);
-
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.NoContent;
+                
+                NoContentStatus();
             }
         }
 
@@ -88,7 +87,7 @@ public async Task DeletePrefixedShardingSetting()
                     urls = shardingConfiguration.Orchestrator.Topology.Members.Select(clusterTopology.GetUrlFromTag).ToArray();
                 }
 
-                if (await AssertNoDocumentsStartingWith(context, setting.Prefix, urls) == false)
+                if (await AssertNoDocumentsStartingWithAsync(context, setting.Prefix, urls) == false)
                     throw new InvalidOperationException(
                         $"Cannot remove prefix '{setting.Prefix}' from {nameof(ShardingConfiguration)}.{nameof(ShardingConfiguration.Prefixed)}. " +
                         $"There are existing documents in database '{DatabaseName}' that start with '{setting.Prefix}'. " +
@@ -99,7 +98,7 @@ public async Task DeletePrefixedShardingSetting()
 
                 await DatabaseContext.ServerStore.WaitForExecutionOnRelevantNodesAsync(context, shardingConfiguration.Orchestrator.Topology.Members, raftIndex);
 
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.NoContent;
+                NoContentStatus();
             }
         }
 
@@ -125,7 +124,7 @@ public async Task UpdatePrefixedShardingSetting()
 
                 await DatabaseContext.ServerStore.WaitForExecutionOnRelevantNodesAsync(context, shardingConfiguration.Orchestrator.Topology.Members, raftIndex);
 
-                HttpContext.Response.StatusCode = (int)HttpStatusCode.NoContent;
+                NoContentStatus();
             }
         }
 
@@ -195,7 +194,7 @@ private static void AssertValidShardsDistribution(PrefixedShardingSetting oldSet
             }
         }
 
-        private async Task<bool> AssertNoDocumentsStartingWith(JsonOperationContext context, string prefix, string[] urls, string database = null)
+        private async Task<bool> AssertNoDocumentsStartingWithAsync(JsonOperationContext context, string prefix, string[] urls, string database = null)
         {
             using (var requestExecutor = RequestExecutor.CreateForServer(urls, database ?? DatabaseName, ServerStore.Server.Certificate.Certificate, DocumentConventions.DefaultForServer))
             {