Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit 441c0b8

Browse files
thefringeninjathefringeninja
committed
minor cleanup
1 parent 62cade6 commit 441c0b8

23 files changed

Lines changed: 84 additions & 97 deletions

‎src/SqlStreamStore.HAL.Tests/AllStreamMessageTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public async Task read_single_message_all_stream()
3030
var resource = await response.AsHal();
3131

3232
resource.ShouldLink(
33-
TheLinks
33+
Links
3434
.RootedAt("../")
3535
.Find()
3636
.Index()
@@ -48,7 +48,7 @@ public async Task read_single_message_does_not_exist_all_stream()
4848

4949
var resource = await response.AsHal();
5050

51-
resource.ShouldLink(TheLinks
51+
resource.ShouldLink(Links
5252
.RootedAt("../")
5353
.AddSelf(Constants.Relations.Message, "stream/0")
5454
.Add(Constants.Relations.Feed, HeadOfAll));

‎src/SqlStreamStore.HAL.Tests/CanonicalUrlTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Net;
77
using System.Threading.Tasks;
88
using Shouldly;
9-
using SqlStreamStore.HAL.Resources;
109
using Xunit;
1110

1211
public class CanonicalUrlTests
@@ -50,8 +49,8 @@ from set in GetPermutations(parameters, 4)
5049

5150
var formatters = new Dictionary<bool, Func<string, int, long, bool, string>>
5251
{
53-
[true] = LinkFormatter.FormatForwardLink,
54-
[false] = LinkFormatter.FormatBackwardLink
52+
[true] = Links.FormatForwardLink,
53+
[false] = Links.FormatBackwardLink
5554
};
5655

5756
(string streamId, string path, string root)[] streams =

‎src/SqlStreamStore.HAL.Tests/HeadersTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Net.Http;
66
using System.Threading.Tasks;
77
using Shouldly;
8-
using SqlStreamStore.HAL.Resources;
98
using SqlStreamStore.Streams;
109
using Xunit;
1110

@@ -37,7 +36,7 @@ public async Task all_stream_head_link(HttpMethod method)
3736
using(var response = await _fixture.HttpClient.SendAsync(
3837
new HttpRequestMessage(
3938
method,
40-
LinkFormatter.FormatBackwardLink("/stream", 20, Position.End, true))))
39+
Links.FormatBackwardLink("/stream", 20, Position.End, true))))
4140
{
4241
response.IsSuccessStatusCode.ShouldBeTrue();
4342

‎src/SqlStreamStore.HAL.Tests/LinkAssertionExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static void ShouldLink(this Resource resource, string rel, string href, s
1414
Title = title
1515
});
1616

17-
public static void ShouldLink(this Resource resource, TheLinks links)
17+
public static void ShouldLink(this Resource resource, Links links)
1818
{
1919
var halLinks = links.ToHalLinks();
2020

‎src/SqlStreamStore.HAL.Tests/StreamMessageTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public async Task read_single_message_stream()
3030
3131
var resource = await response.AsHal();
3232
33-
resource.ShouldLink(TheLinks
33+
resource.ShouldLink(Links
3434
.RootedAt("../../")
3535
.Index()
3636
.Find()
@@ -53,7 +53,7 @@ public async Task read_single_message_does_not_exist_stream()
5353

5454
var resource = await response.AsHal();
5555

56-
resource.ShouldLink(TheLinks
56+
resource.ShouldLink(Links
5757
.RootedAt("../../")
5858
.Index()
5959
.Find()

‎src/SqlStreamStore.HAL.Tests/StreamMetadataTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ await _fixture.HttpClient.SendAsync(
4141
((string) resource.State.metadataJson).ShouldBeNull();
4242

4343
resource.ShouldLink(
44-
TheLinks
44+
Links
4545
.RootedAt("../../../")
4646
.Index()
4747
.Find()
@@ -92,7 +92,7 @@ await _fixture.HttpClient.SendAsync(
9292
})).ShouldBeTrue();
9393

9494
resource.ShouldLink(
95-
TheLinks
95+
Links
9696
.RootedAt("../../../")
9797
.Index()
9898
.Find()
@@ -138,7 +138,7 @@ public async Task set_metadata()
138138
})).ShouldBeTrue();
139139

140140
resource.ShouldLink(
141-
TheLinks
141+
Links
142142
.RootedAt("../../../")
143143
.Index()
144144
.Find()

‎src/SqlStreamStore.HAL.Tests/StreamNavigationTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public async Task read_head_link_no_messages(string path, string root, HttpStatu
4545

4646
var resource = await response.AsHal();
4747

48-
var links = TheLinks
48+
var links = Links
4949
.RootedAt(root)
5050
.Index()
5151
.Find()
@@ -84,7 +84,7 @@ public async Task read_head_link_when_multiple_pages(string path, string root)
8484

8585
var resource = await response.AsHal();
8686

87-
var links = TheLinks
87+
var links = Links
8888
.RootedAt(root)
8989
.Index()
9090
.Find()
@@ -118,7 +118,7 @@ public async Task read_first_link(string path, string root)
118118

119119
var resource = await response.AsHal();
120120

121-
var links = TheLinks.RootedAt(root)
121+
var links = Links.RootedAt(root)
122122
.Index()
123123
.Find()
124124
.Add(Constants.Relations.Self, $"{path}?{FirstLinkQuery}")
@@ -146,7 +146,7 @@ public async Task read_first_link_when_multiple_pages(string path, string root)
146146

147147
var resource = await response.AsHal();
148148

149-
var links = TheLinks.RootedAt(root)
149+
var links = Links.RootedAt(root)
150150
.Index()
151151
.Find()
152152
.Add(Constants.Relations.Self, $"{path}?{FirstLinkQuery}")

‎src/SqlStreamStore.HAL/AllStream/AllStreamLinkExtensions.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
namespace SqlStreamStore.HAL.AllStream
22
{
33
using System.Linq;
4-
using SqlStreamStore.HAL.Resources;
54
using SqlStreamStore.Streams;
65

76
internal static class AllStreamLinkExtensions
87
{
9-
public static TheLinks Navigation(
10-
this TheLinks links,
8+
public static Links AllStreamNavigation(
9+
this Links links,
1110
ReadAllPage page,
1211
ReadAllStreamOperation operation)
1312
{
14-
var first = LinkFormatter.FormatForwardLink(
13+
var first = Links.FormatForwardLink(
1514
Constants.Streams.All,
1615
operation.MaxCount,
1716
Position.Start,
1817
operation.EmbedPayload);
1918

20-
var last = LinkFormatter.FormatBackwardLink(
19+
var last = Links.FormatBackwardLink(
2120
Constants.Streams.All,
2221
operation.MaxCount,
2322
Position.End,
@@ -29,7 +28,7 @@ public static TheLinks Navigation(
2928
{
3029
links.Add(
3130
Constants.Relations.Previous,
32-
LinkFormatter.FormatBackwardLink(
31+
Links.FormatBackwardLink(
3332
Constants.Streams.All,
3433
operation.MaxCount,
3534
page.Messages.Min(m => m.Position) - 1,
@@ -42,7 +41,7 @@ public static TheLinks Navigation(
4241
{
4342
links.Add(
4443
Constants.Relations.Next,
45-
LinkFormatter.FormatForwardLink(
44+
Links.FormatForwardLink(
4645
Constants.Streams.All,
4746
operation.MaxCount,
4847
page.Messages.Max(m => m.Position) + 1,

‎src/SqlStreamStore.HAL/AllStream/AllStreamResource.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ public async Task<Response> Get(
5151
page.IsEnd
5252
})
5353
.AddLinks(
54-
TheLinks
54+
Links
5555
.RootedAt(string.Empty)
5656
.Index()
5757
.Find()
58-
.Navigation(page, operation))
58+
.AllStreamNavigation(page, operation))
5959
.AddEmbeddedCollection(
6060
Constants.Relations.Message,
6161
streamMessages.Zip(
@@ -72,7 +72,7 @@ public async Task<Response> Get(
7272
metadata = message.JsonMetadata
7373
})
7474
.AddLinks(
75-
TheLinks.RootedAt(string.Empty)
75+
Links.RootedAt(string.Empty)
7676
.Add(
7777
Constants.Relations.Message,
7878
$"streams/{message.StreamId}/{message.StreamVersion}")

‎src/SqlStreamStore.HAL/AllStream/ReadAllStreamOperation.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ namespace SqlStreamStore.HAL.AllStream
33
using System.Threading;
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Http;
6-
using SqlStreamStore.HAL.Resources;
76
using SqlStreamStore.Streams;
87

98
internal class ReadAllStreamOperation : IStreamStoreOperation<ReadAllPage>
@@ -42,12 +41,12 @@ public ReadAllStreamOperation(HttpRequest request)
4241
: Constants.MaxCount;
4342

4443
Self = ReadDirection == Constants.ReadDirection.Forwards
45-
? LinkFormatter.FormatForwardLink(
44+
? Links.FormatForwardLink(
4645
Constants.Streams.All,
4746
MaxCount,
4847
FromPositionInclusive,
4948
EmbedPayload)
50-
: LinkFormatter.FormatBackwardLink(
49+
: Links.FormatBackwardLink(
5150
Constants.Streams.All,
5251
MaxCount,
5352
FromPositionInclusive,

0 commit comments

Comments
 (0)