DRY

Author: thefringeninja

src/SqlStreamStore.HAL/AppendStreamMiddleware.cs

@@ -27,7 +27,7 @@ public static MidFunc UseStreamStore(IStreamStore streamStore)
         }
 
         private static bool IsStream(IOwinContext context)
-            => context.IsPost() && context.Request.Path.Value?.Length > 1;
+            => context.IsPost() && context.Request.Path.IsStream();
 
         private static MidFunc AppendStream(StreamResource stream) => next => async env =>
         {

src/SqlStreamStore.HAL/DeleteStreamMiddleware.cs

@@ -27,8 +27,7 @@ public static MidFunc UseStreamStore(IStreamStore streamStore)
         }
 
         private static bool IsStream(IOwinContext context)
-            => context.IsDelete() && context.Request.Path.Value?.Length > 1;
-
+            => context.IsDelete() && context.Request.Path.IsStream();
 
         private static MidFunc DeleteStream(StreamResource stream) => next => async env =>
         {

src/SqlStreamStore.HAL/PathStringExtensions.cs

@@ -0,0 +1,19 @@
+namespace SqlStreamStore.HAL
+{
+    using Microsoft.Owin;
+
+    internal static class PathStringExtensions
+    {
+        public static bool IsAllStream(this PathString requestPath) 
+            => !requestPath.HasValue;
+
+        public static bool IsAllStreamMessage(this PathString requestPath) 
+            => long.TryParse(requestPath.Value?.Remove(0, 1), out var _);
+
+        public static bool IsStream(this PathString requestPath) 
+            => requestPath.Value?.Length > 1;
+
+        public static bool IsStreamMessage(this PathString requestPath) 
+            => requestPath.Value?.Split('/')?.Length == 3;
+    }
+}

src/SqlStreamStore.HAL/ReadAllStreamMiddleware.cs

@@ -18,9 +18,9 @@ public static MidFunc UseStreamStore(IReadonlyStreamStore streamStore)
             var allStream = new AllStreamResource(streamStore);
 
             var builder = new AppBuilder()
-                .MapWhen(IsStream, inner => inner.Use(GetStream(allStream)))
+                .MapWhen(IsAllStream, inner => inner.Use(GetStream(allStream)))
                 .MapWhen(IsStreamOptions, inner => inner.Use(GetStreamOptions))
-                .MapWhen(IsStreamMessage, inner => inner.Use(GetStreamMessage(allStream)))
+                .MapWhen(IsAllStreamMessage, inner => inner.Use(GetStreamMessage(allStream)))
                 .MapWhen(IsStreamMessageOptions, inner => inner.Use(GetStreamMessageOptions));
 
             return next =>
@@ -31,23 +31,17 @@ public static MidFunc UseStreamStore(IReadonlyStreamStore streamStore)
             };
         }
 
-        private static bool IsStream(PathString requestPath) 
-            => !requestPath.HasValue;
-
-        private static bool IsStream(IOwinContext context)
-            => context.IsGetOrHead() && IsStream(context.Request.Path);
+        private static bool IsAllStream(IOwinContext context)
+            => context.IsGetOrHead() && context.Request.Path.IsAllStream();
 
         private static bool IsStreamOptions(IOwinContext context)
-            => context.IsOptions() && IsStream(context.Request.Path);
-
-        private static bool IsStreamMessage(PathString requestPath) 
-            => long.TryParse(requestPath.Value?.Remove(0, 1), out var _);
+            => context.IsOptions() && context.Request.Path.IsAllStream();
 
-        private static bool IsStreamMessage(IOwinContext context)
-            => context.IsGetOrHead() && IsStreamMessage(context.Request.Path);
+        private static bool IsAllStreamMessage(IOwinContext context)
+            => context.IsGetOrHead() && context.Request.Path.IsAllStreamMessage();
 
         private static bool IsStreamMessageOptions(IOwinContext context)
-            => context.IsOptions() && IsStreamMessage(context.Request.Path);
+            => context.IsOptions() && context.Request.Path.IsAllStreamMessage();
 
         private static MidFunc GetStream(AllStreamResource allStream) => next => async env =>
         {

src/SqlStreamStore.HAL/ReadStreamMiddleware.cs

@@ -30,25 +30,19 @@ public static MidFunc UseStreamStore(IStreamStore streamStore)
                 return builder.Build();
             };
         }
-        
-        
-        private static bool IsStream(PathString requestPath) 
-            => requestPath.Value?.Length > 1;
+
 
         private static bool IsStream(IOwinContext context)
-            => context.IsGetOrHead() && IsStream(context.Request.Path);
+            => context.IsGetOrHead() && context.Request.Path.IsStream();
 
         private static bool IsStreamOptions(IOwinContext context)
-            => context.IsOptions() && IsStream(context.Request.Path);
-        
-        private static bool IsStreamMessage(PathString requestPath) 
-            => requestPath.Value?.Split('/')?.Length == 3;
+            => context.IsOptions() && context.Request.Path.IsStream();
 
         private static bool IsStreamMessage(IOwinContext context)
-            => context.IsGetOrHead() && IsStreamMessage(context.Request.Path);
+            => context.IsGetOrHead() && context.Request.Path.IsStreamMessage();
 
         private static bool IsStreamMessageOptions(IOwinContext context)
-            => context.IsOptions() && IsStreamMessage(context.Request.Path);
+            => context.IsOptions() && context.Request.Path.IsStreamMessage();
 
         private static MidFunc GetStream(StreamResource stream) => next => async env =>
         {