More review comments

Author: Sushisource

src/Temporalio/Worker/WorkflowInstance.cs

@@ -1141,18 +1141,15 @@ private void ApplyQueryWorkflow(QueryWorkflow query)
                 try
                 {
                     WorkflowQueryDefinition? queryDefn;
-                    // If it's a stack trace query, create definition
+                    object? resultObj;
+
                     if (query.QueryType == "__stack_trace")
                     {
-                        Func<string> getter = GetStackTrace;
-                        queryDefn = WorkflowQueryDefinition.CreateWithoutAttributeReservedName(
-                            "__stack_trace", getter);
+                        resultObj = GetStackTrace();
                     }
                     else if (query.QueryType == "__temporal_workflow_metadata")
                     {
-                        Func<Api.Sdk.V1.WorkflowMetadata> getter = GetWorkflowMetadata;
-                        queryDefn = WorkflowQueryDefinition.CreateWithoutAttributeReservedName(
-                            "__temporal_workflow_metadata", getter);
+                        resultObj = GetWorkflowMetadata();
                     }
                     else
                     {
@@ -1173,8 +1170,7 @@ private void ApplyQueryWorkflow(QueryWorkflow query)
                                     $"known queries: [{string.Join(" ", knownQueries)}]");
                             }
                         }
-                    }
-                    var resultObj = inbound.Value.HandleQuery(new(
+                        resultObj = inbound.Value.HandleQuery(new(
                             Id: query.QueryId,
                             Query: query.QueryType,
                             Definition: queryDefn,
@@ -1185,6 +1181,7 @@ private void ApplyQueryWorkflow(QueryWorkflow query)
                                 dynamic: queryDefn.Dynamic,
                                 dynamicArgPrepend: query.QueryType),
                             Headers: query.Headers));
+                    }
                     AddCommand(new()
                     {
                         RespondToQuery = new()

src/Temporalio/Workflows/WorkflowQueryDefinition.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Concurrent;
+using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Temporalio.Runtime;
@@ -11,10 +12,7 @@ namespace Temporalio.Workflows
     /// </summary>
     public class WorkflowQueryDefinition
     {
-        /// <summary>
-        /// All known reserved query handler prefixes.
-        /// </summary>
-        internal static readonly string[] ReservedQueryHandlerPrefixes =
+        private static readonly string[] ReservedQueryHandlerPrefixes =
         {
             TemporalRuntime.ReservedNamePrefix,
             "__stack_trace",
@@ -24,16 +22,14 @@ public class WorkflowQueryDefinition
         private static readonly ConcurrentDictionary<MethodInfo, WorkflowQueryDefinition> MethodDefinitions = new();
         private static readonly ConcurrentDictionary<PropertyInfo, WorkflowQueryDefinition> PropertyDefinitions = new();
 
-        private WorkflowQueryDefinition(string? name, string? description, MethodInfo? method, Delegate? del, bool bypassReserved = false)
+        private WorkflowQueryDefinition(string? name, string? description, MethodInfo? method, Delegate? del)
         {
-            if (!bypassReserved && name != null)
+            if (name != null)
             {
-                foreach (var reservedQ in ReservedQueryHandlerPrefixes)
+                var reservedQ = ReservedQueryHandlerPrefixes.FirstOrDefault(p => name.StartsWith(p));
+                if (!string.IsNullOrEmpty(reservedQ))
                 {
-                    if (name.StartsWith(reservedQ))
-                    {
-                        throw new ArgumentException($"Query handler name {name} cannot start with {reservedQ}");
-                    }
+                    throw new ArgumentException($"Query handler name {name} cannot start with {reservedQ}");
                 }
             }
             Name = name;
@@ -127,21 +123,6 @@ public static WorkflowQueryDefinition CreateWithoutAttribute(
             return new(name, description, null, del);
         }
 
-        /// <summary>
-        /// Internal version of <see cref="CreateWithoutAttribute" /> that bypasses reserved name checks.
-        /// </summary>
-        /// <param name="name">Query name. Null for dynamic query.</param>
-        /// <param name="del">Query delegate.</param>
-        /// <param name="description">Optional description. WARNING: This setting is experimental.
-        /// </param>
-        /// <returns>Query definition.</returns>
-        internal static WorkflowQueryDefinition CreateWithoutAttributeReservedName(
-            string name, Delegate del, string? description = null)
-        {
-            AssertValid(del.Method, dynamic: name == null);
-            return new(name, description, null, del, bypassReserved: true);
-        }
-
         /// <summary>
         /// Gets the query name for calling or fail if no attribute or if dynamic.
         /// </summary>