refactoring before getting down to the nitty gritty

Author: thefringeninja

src/SqlStreamStore.HAL/AllStreamOptionsMiddleware.cs

@@ -34,7 +34,7 @@ private static Action<IApplicationBuilder> ConfigureOptions(IResource resource)
 
         private static MidFunc Options(IResource resource) => (context, next) =>
         {
-            context.SetStandardCorsHeaders(resource.Options);
+            context.SetStandardCorsHeaders(resource.Allowed);
 
             return Task.CompletedTask;
         };

src/SqlStreamStore.HAL/AppendStreamMiddleware.cs

@@ -25,7 +25,7 @@ private static MidFunc AppendStream(StreamResource stream) => async (context, ne
         {
             var options = await AppendStreamOperation.Create(context.Request, context.RequestAborted);
 
-            var response = await stream.AppendMessages(options, context.RequestAborted);
+            var response = await stream.Post(options, context.RequestAborted);
 
             await context.WriteHalResponse(response);
         };

src/SqlStreamStore.HAL/HttpContextExtensions.cs

@@ -46,8 +46,9 @@ public static void SetStandardCorsHeaders(this HttpContext context, params HttpM
         {
             if(allowedMethods?.Length > 0)
             {
-                context.Response.Headers.Append("Access-Control-Allow-Methods",
-                    allowedMethods.Select(_ => _.Method).ToArray());
+                context.Response.Headers.Append(
+                    "Access-Control-Allow-Methods",
+                    Array.ConvertAll(allowedMethods, _ => _.Method));
             }
 
             context.Response.Headers.Append(

src/SqlStreamStore.HAL/ReadAllStreamMiddleware.cs

@@ -32,7 +32,7 @@ private static MidFunc GetStream(AllStreamResource allStream) => async (context,
         {
             var options = new ReadAllStreamOperation(context.Request);
 
-            var response = await allStream.GetPage(options, context.RequestAborted);
+            var response = await allStream.Get(options, context.RequestAborted);
 
             using(new OptionalHeadRequestWrapper(context))
             {
@@ -42,7 +42,7 @@ private static MidFunc GetStream(AllStreamResource allStream) => async (context,
 
         private static MidFunc GetStreamMessage(AllStreamMessageResource allStreamMessages) => async (context, next) => 
         {
-            var response = await allStreamMessages.GetMessage(
+            var response = await allStreamMessages.Get(
                 new ReadAllStreamMessageOperation(context.Request),
                 context.RequestAborted);
 

src/SqlStreamStore.HAL/ReadStreamMiddleware.cs

@@ -31,7 +31,7 @@ private static MidFunc GetStream(StreamResource streams) => async (context, next
         {
             var options = new ReadStreamOperation(context.Request);
 
-            var response = await streams.GetPage(options, context.RequestAborted);
+            var response = await streams.Get(options, context.RequestAborted);
 
             using(new OptionalHeadRequestWrapper(context))
             {
@@ -43,7 +43,7 @@ private static MidFunc GetStreamMessage(StreamMessageResource streamMessages) =>
         {
             var options = new ReadStreamMessageByStreamVersionOperation(context.Request);
 
-            var response = await streamMessages.GetMessage(options, context.RequestAborted);
+            var response = await streamMessages.Get(options, context.RequestAborted);
 
             using(new OptionalHeadRequestWrapper(context))
             {

src/SqlStreamStore.HAL/Resources/AllStreamMessageResource.cs

@@ -11,7 +11,7 @@ internal class AllStreamMessageResource : IResource
     {
         private readonly IStreamStore _streamStore;
 
-        public HttpMethod[] Options { get; } =
+        public HttpMethod[] Allowed { get; } =
         {
             HttpMethod.Get,
             HttpMethod.Head,
@@ -25,7 +25,7 @@ public AllStreamMessageResource(IStreamStore streamStore)
             _streamStore = streamStore;
         }
 
-        public async Task<Response> GetMessage(
+        public async Task<Response> Get(
             ReadAllStreamMessageOperation operation,
             CancellationToken cancellationToken)
         {

src/SqlStreamStore.HAL/Resources/AllStreamResource.cs

@@ -13,7 +13,7 @@ internal class AllStreamResource : IResource
     {
         private readonly IStreamStore _streamStore;
 
-        public HttpMethod[] Options { get; } =
+        public HttpMethod[] Allowed { get; } =
         {
             HttpMethod.Get,
             HttpMethod.Head,
@@ -27,19 +27,20 @@ public AllStreamResource(IStreamStore streamStore)
             _streamStore = streamStore;
         }
 
-        public async Task<Response> GetPage(
+        public async Task<Response> Get(
             ReadAllStreamOperation operation,
             CancellationToken cancellationToken)
         {
             var page = await operation.Invoke(_streamStore, cancellationToken);
 
             var streamMessages = page.Messages.OrderByDescending(m => m.Position).ToArray();
 
-            var payloads = await Task.WhenAll(streamMessages
-                .Select(message => operation.EmbedPayload
-                    ? message.GetJsonData(cancellationToken)
-                    : Task.FromResult<string>(null))
-                .ToArray());
+            var payloads = await Task.WhenAll(
+                Array.ConvertAll(
+                    streamMessages,
+                    message => operation.EmbedPayload
+                        ? message.GetJsonData(cancellationToken)
+                        : SkippedPayload.Instance));
 
             var response = new Response(
                 new HALResponse(new

src/SqlStreamStore.HAL/Resources/AppendStreamOperation.cs

@@ -43,8 +43,7 @@ private AppendStreamOperation(HttpRequest request)
         private AppendStreamOperation(HttpRequest request, JArray body)
             : this(request)
         {
-            NewStreamMessages = body.Select(ParseNewStreamMessage)
-                .ToArray();
+            NewStreamMessages = body.Select(ParseNewStreamMessage).ToArray();
         }
 
         private AppendStreamOperation(HttpRequest request, JObject body)

src/SqlStreamStore.HAL/Resources/IResource.cs

@@ -4,6 +4,6 @@
 
     internal interface IResource
     {
-        HttpMethod[] Options { get; }
+        HttpMethod[] Allowed { get; }
     }
 }

src/SqlStreamStore.HAL/Resources/SkipPayload.cs

@@ -0,0 +1,9 @@
+namespace SqlStreamStore.HAL.Resources
+{
+    using System.Threading.Tasks;
+
+    internal static class SkippedPayload
+    {
+        public static readonly Task<string> Instance = Task.FromResult<string>(null);
+    }
+}