removed last vestiges of static link classes

Author: thefringeninja

src/SqlStreamStore.HAL/AllStream/AllStreamResource.cs

@@ -72,8 +72,12 @@ public async Task<Response> Get(
                                     metadata = message.JsonMetadata
                                 })
                                 .AddLinks(
-                                    Links.Message.Self(message),
-                                    Links.Message.Feed(message)))));
+                                    TheLinks.RootedAt(string.Empty)
+                                        .Add(
+                                            Constants.Relations.Message,
+                                            $"streams/{message.StreamId}/{message.StreamVersion}")
+                                        .Self()
+                                        .Add(Constants.Relations.Feed, $"streams/{message.StreamId}")))));
 
             if(operation.FromPositionInclusive == Position.End)
             {
@@ -96,19 +100,5 @@ public async Task<Response> Get(
 
             return response;
         }
-
-        private static class Links
-        {
-            public static class Message
-            {
-                public static Link Self(StreamMessage message) => new Link(
-                    Constants.Relations.Self,
-                    $"streams/{message.StreamId}/{message.StreamVersion}");
-
-                public static Link Feed(StreamMessage message) => new Link(
-                    Constants.Relations.Feed,
-                    $"streams/{message.StreamId}");
-            }
-        }
     }
 }

src/SqlStreamStore.HAL/LinkExtensions.cs

@@ -0,0 +1,11 @@
+namespace SqlStreamStore.HAL
+{
+    internal static class LinkExtensions
+    {
+        public static TheLinks Index(this TheLinks links) =>
+            links.Add(Constants.Relations.Index, string.Empty, "Index");
+
+        public static TheLinks Find(this TheLinks links)
+            => links.Add(Constants.Relations.Find, "streams/{streamId}", "Find a Stream");
+    }
+}

src/SqlStreamStore.HAL/Links.cs

@@ -4,24 +4,6 @@ namespace SqlStreamStore.HAL
     using System.Collections.Generic;
     using Halcyon.HAL;
 
-    internal static class Links
-    {
-        public static Link Find(string href) =>
-            new Link(Constants.Relations.Find, href, "Find a Stream", replaceParameters: false);
-
-        public static Link Index(string href) =>
-            new Link(Constants.Relations.Index, href, "Index", replaceParameters: false);
-    }
-
-    internal static class LinkExtensions
-    {
-        public static TheLinks Index(this TheLinks links) =>
-            links.Add(Constants.Relations.Index, string.Empty, "Index");
-
-        public static TheLinks Find(this TheLinks links)
-            => links.Add(Constants.Relations.Find, "streams/{streamId}", "Find a Stream");
-    }
-
     internal class TheLinks
     {
         private readonly List<(string rel, string href, string title)> _links;

src/SqlStreamStore.HAL/Streams/StreamResource.cs

@@ -5,7 +5,6 @@ namespace SqlStreamStore.HAL.Streams
     using System.Threading;
     using System.Threading.Tasks;
     using Halcyon.HAL;
-    using SqlStreamStore.HAL.Resources;
     using SqlStreamStore.Streams;
 
     internal class StreamResource : IResource
@@ -32,11 +31,14 @@ public async Task<Response> Post(
         {
             var result = await operation.Invoke(_streamStore, cancellationToken);
 
+            var links = TheLinks.RootedAt(_relativePathToRoot)
+                .Index()
+                .Find()
+                .Add(Constants.Relations.Feed, $"streams/{operation.StreamId}").Self();
+
             var response = new Response(
                 new HALResponse(result)
-                    .AddLinks(Links.Self(operation))
-                    .AddLinks(Links.Feed(operation))
-                    .AddLinks(Links.Find()),
+                    .AddLinks(links),
                 result.CurrentVersion == 0
                     ? 201
                     : 200);
@@ -106,8 +108,12 @@ public async Task<Response> Get(ReadStreamOperation operation, CancellationToken
                                     metadata = message.JsonMetadata
                                 })
                                 .AddLinks(
-                                    Links.Message.Self(message),
-                                    Links.Message.Feed(message)))),
+                                    TheLinks.RootedAt(_relativePathToRoot)
+                                        .Add(
+                                            Constants.Relations.Message, 
+                                            $"{message.StreamId}/{message.StreamVersion}")
+                                        .Self()
+                                        .Add(Constants.Relations.Feed, message.StreamId)))),
                 page.Status == PageReadStatus.StreamNotFound ? 404 : 200);
 
             if(page.TryGetETag(out var eTag))
@@ -124,34 +130,5 @@ public async Task<Response> Delete(DeleteStreamOperation operation, Cancellation
 
             return new Response(new HALResponse(new object()));
         }
-
-        private static class Links
-        {
-            public static Link Find() => SqlStreamStore.HAL.Links.Find("../streams/{streamId}");
-
-            public static Link Self(AppendStreamOperation operation) => new Link(
-                Constants.Relations.Self,
-                $"{operation.StreamId}");
-
-            public static Link Feed(AppendStreamOperation operation)
-                => new Link(
-                    Constants.Relations.Feed,
-                    LinkFormatter.FormatBackwardLink(
-                        operation.StreamId,
-                        Constants.MaxCount,
-                        StreamVersion.End,
-                        false));
-
-            public static class Message
-            {
-                public static Link Self(StreamMessage message) => new Link(
-                    Constants.Relations.Self,
-                    $"{message.StreamId}/{message.StreamVersion}");
-
-                public static Link Feed(StreamMessage message) => new Link(
-                    Constants.Relations.Feed,
-                    message.StreamId);
-            }
-        }
     }
 }