Introduced TrySetServices on the request

ChilliCream · Mar 12, 2020 · 0055455 · 0055455
1 parent 6a994a6
commit 0055455
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/Core/Abstractions/Execution/IQueryRequestBuilder.cs b/src/Core/Abstractions/Execution/IQueryRequestBuilder.cs
@@ -81,6 +81,9 @@ IQueryRequestBuilder SetExtension(
         IQueryRequestBuilder SetServices(
             IServiceProvider services);
 
+        IQueryRequestBuilder TrySetServices(
+            IServiceProvider services);
+
         IReadOnlyQueryRequest Create();
     }
 }
diff --git a/src/Core/Abstractions/Execution/QueryRequestBuilder.cs b/src/Core/Abstractions/Execution/QueryRequestBuilder.cs
@@ -78,6 +78,16 @@ public IQueryRequestBuilder SetServices(
             return this;
         }
 
+        public IQueryRequestBuilder TrySetServices(
+            IServiceProvider services)
+        {
+            if (_services is null)
+            {
+                _services = services;
+            }
+            return this;
+        }
+
         public IQueryRequestBuilder SetVariableValues(
             Dictionary<string, object> variableValues) =>
             SetVariableValues((IDictionary<string, object>)variableValues);

diff --git a/src/Server/AspNetCore.Abstractions/QueryMiddlewareBase.cs b/src/Server/AspNetCore.Abstractions/QueryMiddlewareBase.cs
@@ -218,8 +218,7 @@ protected async Task<IReadOnlyQueryRequest> BuildRequestAsync(
         {
             if (!_interceptorInitialized)
             {
-                _interceptor = services
-                    .GetService<IQueryRequestInterceptor<HttpContext>>();
+                _interceptor = services.GetService<IQueryRequestInterceptor<HttpContext>>();
                 _interceptorInitialized = true;
             }
 
@@ -232,7 +231,7 @@ await _interceptor.OnCreateAsync(
                     .ConfigureAwait(false);
             }
 
-            builder.SetServices(services);
+            builder.TrySetServices(services);
             builder.TryAddProperty(nameof(HttpContext), context);
             builder.TryAddProperty(nameof(ClaimsPrincipal), context.GetUser());