Allow empty IdSpan (#9175)

dotnet · Oct 14, 2024 · f93e742 · f93e742
1 parent 2bfd15d
commit f93e742
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git a/src/Orleans.Core.Abstractions/IDs/ClientGrainId.cs b/src/Orleans.Core.Abstractions/IDs/ClientGrainId.cs
@@ -26,7 +26,11 @@ namespace Orleans.Runtime
         /// <summary>
         /// Creates a new <see cref="ClientGrainId"/> instance.
         /// </summary>
-        public static ClientGrainId Create(string id) => Create(IdSpan.Create(id));
+        public static ClientGrainId Create(string id)
+        {
+            ArgumentNullException.ThrowIfNullOrWhiteSpace(id);
+            return Create(IdSpan.Create(id));
+        }
 
         /// <summary>
         /// Creates a new <see cref="ClientGrainId"/> instance.

diff --git a/src/Orleans.Core.Abstractions/IDs/GrainId.cs b/src/Orleans.Core.Abstractions/IDs/GrainId.cs
@@ -56,7 +56,11 @@ private GrainId(SerializationInfo info, StreamingContext context)
         /// <summary>
         /// Creates a new <see cref="GrainType"/> instance.
         /// </summary>
-        public static GrainId Create(GrainType type, string key) => new GrainId(type, IdSpan.Create(key));
+        public static GrainId Create(GrainType type, string key)
+        {
+            ArgumentNullException.ThrowIfNullOrWhiteSpace(key);
+            return new GrainId(type, IdSpan.Create(key));
+        }
 
         /// <summary>
         /// Creates a new <see cref="GrainType"/> instance.

diff --git a/src/Orleans.Core.Abstractions/IDs/GrainInterfaceType.cs b/src/Orleans.Core.Abstractions/IDs/GrainInterfaceType.cs
@@ -18,7 +18,11 @@ namespace Orleans.Runtime
         /// <summary>
         /// Creates a <see cref="GrainInterfaceType"/> instance.
         /// </summary>
-        public GrainInterfaceType(string value) => _value = IdSpan.Create(value);
+        public GrainInterfaceType(string value)
+        {
+            ArgumentNullException.ThrowIfNullOrWhiteSpace(value);
+            _value = IdSpan.Create(value);
+        }
 
         /// <summary>
         /// Creates a <see cref="GrainInterfaceType"/> instance.

diff --git a/src/Orleans.Core.Abstractions/IDs/GrainType.cs b/src/Orleans.Core.Abstractions/IDs/GrainType.cs
@@ -66,7 +66,11 @@ private GrainType(SerializationInfo info, StreamingContext context)
         /// <returns>
         /// The newly created <see cref="GrainType"/> instance.
         /// </returns>
-        public static GrainType Create(string value) => new GrainType(Encoding.UTF8.GetBytes(value));
+        public static GrainType Create(string value)
+        {
+            ArgumentNullException.ThrowIfNullOrWhiteSpace(value);
+            return new GrainType(Encoding.UTF8.GetBytes(value));
+        }
 
         /// <summary>
         /// Converts a <see cref="GrainType"/> to a <see cref="IdSpan"/>.

diff --git a/src/Orleans.Core.Abstractions/IDs/IdSpan.cs b/src/Orleans.Core.Abstractions/IDs/IdSpan.cs
@@ -81,12 +81,7 @@ private IdSpan(SerializationInfo info, StreamingContext context)
         /// <returns>
         /// A new <see cref="IdSpan"/> corresponding to the provided id.
         /// </returns>
-        /// <exception cref="ArgumentException"/>
-        public static IdSpan Create(string id)
-        {
-            ArgumentException.ThrowIfNullOrWhiteSpace(id, nameof(id));
-            return new IdSpan(Encoding.UTF8.GetBytes(id));
-        }
+        public static IdSpan Create(string id) => new(Encoding.UTF8.GetBytes(id));
 
         /// <summary>
         /// Returns a span representation of this instance.

diff --git a/src/Orleans.Core/Core/GrainFactory.cs b/src/Orleans.Core/Core/GrainFactory.cs
@@ -55,6 +55,7 @@ public TGrainInterface GetGrain<TGrainInterface>(long primaryKey, string grainCl
         public TGrainInterface GetGrain<TGrainInterface>(string primaryKey, string grainClassNamePrefix = null)
             where TGrainInterface : IGrainWithStringKey
         {
+            ArgumentNullException.ThrowIfNullOrWhiteSpace(primaryKey);
             var grainKey = IdSpan.Create(primaryKey);
             return (TGrainInterface)GetGrain(typeof(TGrainInterface), grainKey, grainClassNamePrefix: grainClassNamePrefix);
         }
@@ -164,6 +165,7 @@ public IGrain GetGrain(Type grainInterfaceType, long key)
         /// <inheritdoc />
         public IGrain GetGrain(Type grainInterfaceType, string key)
         {
+            ArgumentNullException.ThrowIfNullOrWhiteSpace(key);
             var grainKey = IdSpan.Create(key);
             return (IGrain)GetGrain(grainInterfaceType, grainKey, grainClassNamePrefix: null);
         }