minor syntax improvements

Author: thefringeninja

src/SqlStreamStore.HAL/AllStreamMiddleware.cs

@@ -16,13 +16,8 @@ public static MidFunc UseStreamStore(IReadonlyStreamStore streamStore)
             var allStream = new AllStreamResource(streamStore);
 
             var builder = new AppBuilder()
-                .MapWhen(context => !context.Request.Path.HasValue, inner => inner.Use(GetStream(allStream)))
-                .MapWhen(context =>
-                    {
-                        long _;
-                        return long.TryParse(context.Request.Path.Value?.Remove(0, 1), out _);
-                    },
-                    inner => inner.Use(GetStreamMessage(allStream)));
+                .MapWhen(IsStream, inner => inner.Use(GetStream(allStream)))
+                .MapWhen(IsStreamMessage, inner => inner.Use(GetStreamMessage(allStream)));
 
             return next =>
             {
@@ -32,6 +27,12 @@ public static MidFunc UseStreamStore(IReadonlyStreamStore streamStore)
             };
         }
 
+        private static bool IsStream(IOwinContext context)
+            => !context.Request.Path.HasValue;
+
+        private static bool IsStreamMessage(IOwinContext context)
+            => long.TryParse(context.Request.Path.Value?.Remove(0, 1), out var _);
+
         private static MidFunc GetStream(AllStreamResource allStream) => next => async env =>
         {
             var context = new OwinContext(env);

src/SqlStreamStore.HAL/ReadStreamMessageOptions.cs

@@ -14,9 +14,8 @@ public ReadStreamMessageOptions(IOwinRequest request)
             var pieces = request.Path.Value.Split('/').Reverse().Take(2).ToArray();
 
             StreamId = pieces.LastOrDefault();
-            int streamVersion;
 
-            if(int.TryParse(pieces.FirstOrDefault(), out streamVersion))
+            if(int.TryParse(pieces.FirstOrDefault(), out var streamVersion))
             {
                 StreamVersion = streamVersion;
             }

src/SqlStreamStore.HAL/SqlStreamStoreHalMiddleware.cs

@@ -38,9 +38,7 @@ public static class SqlStreamStoreHalMiddleware
                 return next(env);
             }
 
-            var response = new Response(
-                new HALResponse(null)
-                    .AddLinks(new Link("streamStore:stream", "stream")));
+            var response = new Response(new HALResponse(null).AddLinks(new Link("streamStore:stream", "stream")));
 
             return context.WriteHalResponse(response);
         };

src/SqlStreamStore.HAL/StreamMiddleware.cs

@@ -17,9 +17,8 @@ public static MidFunc UseStreamStore(IReadonlyStreamStore streamStore)
             var streams = new StreamResource(streamStore);
 
             var builder = new AppBuilder()
-                .MapWhen(context => context.Request.Path.Value?.Split('/')?.Length == 3,
-                    inner => inner.Use(GetStreamMessage(streams)))
-                .MapWhen(context => context.Request.Path.Value?.Length > 1, inner => inner.Use(GetStream(streams)));
+                .MapWhen(IsStreamMessage, inner => inner.Use(GetStreamMessage(streams)))
+                .MapWhen(IsStream, inner => inner.Use(GetStream(streams)));
 
             return next =>
             {
@@ -29,6 +28,12 @@ public static MidFunc UseStreamStore(IReadonlyStreamStore streamStore)
             };
         }
 
+        private static bool IsStream(IOwinContext context)
+            => context.Request.Path.Value?.Length > 1;
+
+        private static bool IsStreamMessage(IOwinContext context)
+            => context.Request.Path.Value?.Split('/')?.Length == 3;
+
         private static MidFunc GetStream(StreamResource stream) => next => async env =>
         {
             var context = new OwinContext(env);