Skip to content

Commit 5c85c3a

Browse files
bkoelmanbkoelman
committed
Use string interpolation
1 parent 6a87751 commit 5c85c3a

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎src/JsonApiDotNetCore.OpenApi/JsonApiOperationIdSelector.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ namespace JsonApiDotNetCore.OpenApi;
1313
internal sealed class JsonApiOperationIdSelector
1414
{
1515
private const string ResourceOperationIdTemplate = "[Method] [PrimaryResourceName]";
16-
private const string ResourceCollectionOperationIdTemplate = ResourceOperationIdTemplate + " Collection";
17-
private const string SecondaryOperationIdTemplate = ResourceOperationIdTemplate + " [RelationshipName]";
18-
private const string RelationshipOperationIdTemplate = SecondaryOperationIdTemplate + " Relationship";
16+
private const string ResourceCollectionOperationIdTemplate = $"{ResourceOperationIdTemplate} Collection";
17+
private const string SecondaryOperationIdTemplate = $"{ResourceOperationIdTemplate} [RelationshipName]";
18+
private const string RelationshipOperationIdTemplate = $"{SecondaryOperationIdTemplate} Relationship";
1919

2020
private static readonly IDictionary<Type, string> DocumentOpenTypeToOperationIdTemplateMap = new Dictionary<Type, string>
2121
{

‎src/JsonApiDotNetCore.OpenApi/SwaggerComponents/EndpointOrderingFilter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
99
internal sealed class EndpointOrderingFilter : IDocumentFilter
1010
{
1111
private static readonly Regex RelationshipNameInUrlPattern =
12-
new($".*{JsonApiRoutingTemplate.PrimaryEndpoint}/(?>{JsonApiRoutingTemplate.RelationshipsPart}\\/)?(\\w+)", RegexOptions.Compiled);
12+
new($@".*{JsonApiRoutingTemplate.PrimaryEndpoint}/(?>{JsonApiRoutingTemplate.RelationshipsPart}\/)?(\w+)", RegexOptions.Compiled);
1313

1414
public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
1515
{
@@ -34,7 +34,7 @@ private static string GetPrimaryResourcePublicName(KeyValuePair<string, OpenApiP
3434

3535
private static bool IsSecondaryEndpoint(KeyValuePair<string, OpenApiPathItem> entry)
3636
{
37-
return entry.Key.Contains("/" + JsonApiRoutingTemplate.RelationshipsPart);
37+
return entry.Key.Contains($"/{JsonApiRoutingTemplate.RelationshipsPart}");
3838
}
3939

4040
private static string GetRelationshipName(KeyValuePair<string, OpenApiPathItem> entry)

‎test/OpenApiClientTests/LegacyClient/RequestTests.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public async Task Getting_resource_collection_produces_expected_request()
2828
wrapper.Request.ShouldNotBeNull();
2929
wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
3030
wrapper.Request.Method.Should().Be(HttpMethod.Get);
31-
wrapper.Request.RequestUri.Should().Be(HostPrefix + "flights");
31+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights");
3232
wrapper.RequestBody.Should().BeNull();
3333
}
3434

@@ -48,7 +48,7 @@ public async Task Getting_resource_produces_expected_request()
4848
wrapper.Request.ShouldNotBeNull();
4949
wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
5050
wrapper.Request.Method.Should().Be(HttpMethod.Get);
51-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}");
51+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights/{flightId}");
5252
wrapper.RequestBody.Should().BeNull();
5353
}
5454

@@ -93,7 +93,7 @@ public async Task Partial_posting_resource_with_selected_relationships_produces_
9393
wrapper.Request.ShouldNotBeNull();
9494
wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
9595
wrapper.Request.Method.Should().Be(HttpMethod.Post);
96-
wrapper.Request.RequestUri.Should().Be(HostPrefix + "flights");
96+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights");
9797
wrapper.Request.Content.Should().NotBeNull();
9898
wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
9999
wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
@@ -137,7 +137,7 @@ public async Task Partial_posting_resource_produces_expected_request()
137137
capitalLWithStroke
138138
});
139139

140-
string name = "anAirplaneName " + specialCharacters;
140+
string name = $"anAirplaneName {specialCharacters}";
141141

142142
var requestDocument = new AirplanePostRequestDocument
143143
{
@@ -163,7 +163,7 @@ public async Task Partial_posting_resource_produces_expected_request()
163163
wrapper.Request.ShouldNotBeNull();
164164
wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
165165
wrapper.Request.Method.Should().Be(HttpMethod.Post);
166-
wrapper.Request.RequestUri.Should().Be(HostPrefix + "airplanes");
166+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}airplanes");
167167
wrapper.Request.Content.Should().NotBeNull();
168168
wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
169169
wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
@@ -214,7 +214,7 @@ public async Task Partial_patching_resource_produces_expected_request()
214214
wrapper.Request.ShouldNotBeNull();
215215
wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
216216
wrapper.Request.Method.Should().Be(HttpMethod.Patch);
217-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"airplanes/{airplaneId}");
217+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}airplanes/{airplaneId}");
218218
wrapper.Request.Content.Should().NotBeNull();
219219
wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
220220
wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
@@ -248,7 +248,7 @@ public async Task Deleting_resource_produces_expected_request()
248248
// Assert
249249
wrapper.Request.ShouldNotBeNull();
250250
wrapper.Request.Method.Should().Be(HttpMethod.Delete);
251-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}");
251+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights/{flightId}");
252252
wrapper.RequestBody.Should().BeNull();
253253
}
254254

@@ -268,7 +268,7 @@ public async Task Getting_secondary_resource_produces_expected_request()
268268
wrapper.Request.ShouldNotBeNull();
269269
wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
270270
wrapper.Request.Method.Should().Be(HttpMethod.Get);
271-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/purser");
271+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights/{flightId}/purser");
272272
wrapper.RequestBody.Should().BeNull();
273273
}
274274

@@ -288,7 +288,7 @@ public async Task Getting_secondary_resources_produces_expected_request()
288288
wrapper.Request.ShouldNotBeNull();
289289
wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
290290
wrapper.Request.Method.Should().Be(HttpMethod.Get);
291-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/cabin-crew-members");
291+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights/{flightId}/cabin-crew-members");
292292
wrapper.RequestBody.Should().BeNull();
293293
}
294294

@@ -308,7 +308,7 @@ public async Task Getting_ToOne_relationship_produces_expected_request()
308308
wrapper.Request.ShouldNotBeNull();
309309
wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
310310
wrapper.Request.Method.Should().Be(HttpMethod.Get);
311-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/purser");
311+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights/{flightId}/relationships/purser");
312312
wrapper.RequestBody.Should().BeNull();
313313
}
314314

@@ -336,7 +336,7 @@ public async Task Patching_ToOne_relationship_produces_expected_request()
336336
// Assert
337337
wrapper.Request.ShouldNotBeNull();
338338
wrapper.Request.Method.Should().Be(HttpMethod.Patch);
339-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/purser");
339+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights/{flightId}/relationships/purser");
340340
wrapper.Request.Content.Should().NotBeNull();
341341
wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
342342
wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
@@ -365,7 +365,7 @@ public async Task Getting_ToMany_relationship_produces_expected_request()
365365
wrapper.Request.ShouldNotBeNull();
366366
wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
367367
wrapper.Request.Method.Should().Be(HttpMethod.Get);
368-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
368+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights/{flightId}/relationships/cabin-crew-members");
369369
wrapper.RequestBody.Should().BeNull();
370370
}
371371

@@ -401,7 +401,7 @@ public async Task Posting_ToMany_relationship_produces_expected_request()
401401
// Assert
402402
wrapper.Request.ShouldNotBeNull();
403403
wrapper.Request.Method.Should().Be(HttpMethod.Post);
404-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
404+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights/{flightId}/relationships/cabin-crew-members");
405405
wrapper.Request.Content.Should().NotBeNull();
406406
wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
407407
wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
@@ -452,7 +452,7 @@ public async Task Patching_ToMany_relationship_produces_expected_request()
452452
// Assert
453453
wrapper.Request.ShouldNotBeNull();
454454
wrapper.Request.Method.Should().Be(HttpMethod.Patch);
455-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
455+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights/{flightId}/relationships/cabin-crew-members");
456456
wrapper.Request.Content.Should().NotBeNull();
457457
wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
458458
wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
@@ -503,7 +503,7 @@ public async Task Deleting_ToMany_relationship_produces_expected_request()
503503
// Assert
504504
wrapper.Request.ShouldNotBeNull();
505505
wrapper.Request.Method.Should().Be(HttpMethod.Delete);
506-
wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
506+
wrapper.Request.RequestUri.Should().Be($"{HostPrefix}flights/{flightId}/relationships/cabin-crew-members");
507507
wrapper.Request.Content.Should().NotBeNull();
508508
wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
509509
wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);

‎test/OpenApiClientTests/LegacyClient/ResponseTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public async Task Getting_resource_collection_translates_response()
2525
const string purserMetaValue = "https://api.jsonapi.net/docs/#get-flight-purser";
2626
const string cabinCrewMembersMetaValue = "https://api.jsonapi.net/docs/#get-flight-cabin-crew-members";
2727
const string passengersMetaValue = "https://api.jsonapi.net/docs/#get-flight-passengers";
28-
const string topLevelLink = HostPrefix + "flights";
29-
const string flightResourceLink = topLevelLink + "/" + flightId;
28+
const string topLevelLink = $"{HostPrefix}flights";
29+
const string flightResourceLink = $"{topLevelLink}/{flightId}";
3030

3131
const string responseBody = @"{
3232
""meta"": {
@@ -125,20 +125,20 @@ public async Task Getting_resource_collection_translates_response()
125125
flight.Attributes.ArrivesAt.Should().BeNull();
126126

127127
flight.Relationships.Purser.Data.Should().BeNull();
128-
flight.Relationships.Purser.Links.Self.Should().Be(flightResourceLink + "/relationships/purser");
129-
flight.Relationships.Purser.Links.Related.Should().Be(flightResourceLink + "/purser");
128+
flight.Relationships.Purser.Links.Self.Should().Be($"{flightResourceLink}/relationships/purser");
129+
flight.Relationships.Purser.Links.Related.Should().Be($"{flightResourceLink}/purser");
130130
flight.Relationships.Purser.Meta.Should().HaveCount(1);
131131
flight.Relationships.Purser.Meta["docs"].Should().Be(purserMetaValue);
132132

133133
flight.Relationships.CabinCrewMembers.Data.Should().BeNull();
134-
flight.Relationships.CabinCrewMembers.Links.Self.Should().Be(flightResourceLink + "/relationships/cabin-crew-members");
135-
flight.Relationships.CabinCrewMembers.Links.Related.Should().Be(flightResourceLink + "/cabin-crew-members");
134+
flight.Relationships.CabinCrewMembers.Links.Self.Should().Be($"{flightResourceLink}/relationships/cabin-crew-members");
135+
flight.Relationships.CabinCrewMembers.Links.Related.Should().Be($"{flightResourceLink}/cabin-crew-members");
136136
flight.Relationships.CabinCrewMembers.Meta.Should().HaveCount(1);
137137
flight.Relationships.CabinCrewMembers.Meta["docs"].Should().Be(cabinCrewMembersMetaValue);
138138

139139
flight.Relationships.Passengers.Data.Should().BeNull();
140-
flight.Relationships.Passengers.Links.Self.Should().Be(flightResourceLink + "/relationships/passengers");
141-
flight.Relationships.Passengers.Links.Related.Should().Be(flightResourceLink + "/passengers");
140+
flight.Relationships.Passengers.Links.Self.Should().Be($"{flightResourceLink}/relationships/passengers");
141+
flight.Relationships.Passengers.Links.Related.Should().Be($"{flightResourceLink}/passengers");
142142
flight.Relationships.Passengers.Meta.Should().HaveCount(1);
143143
flight.Relationships.Passengers.Meta["docs"].Should().Be(passengersMetaValue);
144144
}

0 commit comments

Comments
 (0)