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

Commit cc915b4

Browse files
fixing json metadata naming on metadata stream
1 parent 342b363 commit cc915b4

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/SqlStreamStore.HAL.Tests/StreamAppendTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ private static IEnumerable<string> MalformedRequests()
236236
}).ToString();
237237

238238
yield return $@"{{ ""messageId"": ""{messageId}"", ""type"": ""{type}"", ""jsonData"": {{ }}";
239-
yield return $@"{{ ""messageId"": ""{messageId}"", ""type"": ""{type}"", ""jsonMetaData"": {{ }}";
239+
yield return $@"{{ ""messageId"": ""{messageId}"", ""type"": ""{type}"", ""jsonMetadata"": {{ }}";
240240
}
241241

242242
public static IEnumerable<object[]> MalformedRequestCases()

src/SqlStreamStore.HAL.Tests/StreamMetadataTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ await _fixture.HttpClient.SendAsync(
3737
((int) resource.State.metadataStreamVersion).ShouldBe(ExpectedVersion.NoStream);
3838
((int?) resource.State.maxAge).ShouldBe(default(int?));
3939
((int?) resource.State.maxCount).ShouldBe(default(int?));
40-
((string) resource.State.metaJson).ShouldBeNull();
40+
((string) resource.State.metadataJson).ShouldBeNull();
4141

4242
resource.ShouldLink(Constants.Relations.Self, "metadata");
4343
resource.ShouldLink(Constants.Relations.Feed, "../");
@@ -54,7 +54,7 @@ public async Task get_metadata_when_metadata_stream_does_exist()
5454
{
5555
maxAge = 30,
5656
maxCount = 20,
57-
metaJson = new
57+
metadataJson = new
5858
{
5959
type = "a-type"
6060
}
@@ -78,7 +78,7 @@ await _fixture.HttpClient.SendAsync(
7878
((int) resource.State.metadataStreamVersion).ShouldBe(0);
7979
((int?) resource.State.maxAge).ShouldBe(30);
8080
((int?) resource.State.maxCount).ShouldBe(20);
81-
JToken.DeepEquals(JObject.Parse((string) resource.State.metaJson),
81+
JToken.DeepEquals(JObject.Parse((string) resource.State.metadataJson),
8282
JObject.FromObject(new
8383
{
8484
type = "a-type"
@@ -99,7 +99,7 @@ public async Task set_metadata()
9999
{
100100
maxAge = 30,
101101
maxCount = 20,
102-
metaJson = new
102+
metadataJson = new
103103
{
104104
type = "a-type"
105105
}
@@ -119,7 +119,7 @@ public async Task set_metadata()
119119
((string) resource.State.streamId).ShouldBe(StreamId);
120120
((int?) resource.State.maxAge).ShouldBe(30);
121121
((int?) resource.State.maxCount).ShouldBe(20);
122-
JToken.DeepEquals(JObject.Parse((string) resource.State.metaJson),
122+
JToken.DeepEquals(JObject.Parse((string) resource.State.metadataJson),
123123
JObject.FromObject(new
124124
{
125125
type = "a-type"
@@ -156,7 +156,7 @@ public async Task set_wrong_expected_version(int[] expectedVersions)
156156
{
157157
maxAge = 30,
158158
maxCount = 20,
159-
metaJson = new
159+
metadataJson = new
160160
{
161161
type = "a-type"
162162
}
@@ -182,7 +182,7 @@ public async Task set_wrong_expected_version(int[] expectedVersions)
182182
{
183183
maxAge = 30,
184184
maxCount = 20,
185-
metaJson = new
185+
metadataJson = new
186186
{
187187
type = "a-type"
188188
}

src/SqlStreamStore.HAL/Resources/SetStreamMetadataOptions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ private SetStreamMetadataOptions(IOwinRequest request, JObject body)
2929
ExpectedVersion = request.GetExpectedVersion();
3030
MaxAge = body.Value<int?>("maxAge");
3131
MaxCount = body.Value<int?>("maxCount");
32-
MetaJson = body["metaJson"]?.ToString(Formatting.Indented);
32+
MetadataJson = body["metadataJson"]?.ToString(Formatting.Indented);
3333
}
3434

3535
public string StreamId { get; }
3636
public int ExpectedVersion { get; }
37-
public string MetaJson { get; }
37+
public string MetadataJson { get; }
3838
public int? MaxCount { get; }
3939
public int? MaxAge { get; }
4040

@@ -44,7 +44,7 @@ public Func<IStreamStore, CancellationToken, Task> GetSetOperation()
4444
ExpectedVersion,
4545
MaxAge,
4646
MaxCount,
47-
MetaJson,
47+
MetadataJson,
4848
ct);
4949
}
5050
}

src/SqlStreamStore.HAL/Resources/StreamMetadataResource.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public async Task<Response> GetStreamMetadata(
4545
result.MetadataStreamVersion,
4646
result.MaxAge,
4747
result.MaxCount,
48-
MetaJson = result.MetadataJson
48+
result.MetadataJson
4949
}).AddLinks(s_links),
5050
result.MetadataStreamVersion >= 0 ? 200 : 404);
5151

@@ -65,7 +65,7 @@ public async Task<Response> SetStreamMetadata(
6565
options.StreamId,
6666
options.MaxAge,
6767
options.MaxCount,
68-
options.MetaJson
68+
options.MetadataJson
6969
})
7070
.AddLinks(s_links));
7171

0 commit comments

Comments
 (0)