Minor refactorings on string interpolation and verbatim strings

Author: bkoelman

src/JsonApiDotNetCore/Middleware/HeaderConstants.cs

@@ -8,5 +8,5 @@ namespace JsonApiDotNetCore.Middleware;
 public static class HeaderConstants
 {
  public const string MediaType = "application/vnd.api+json";
- public const string AtomicOperationsMediaType = MediaType + "; ext=\"https://jsonapi.org/ext/atomic\"";
+ public const string AtomicOperationsMediaType = $"{MediaType}; ext=\"https://jsonapi.org/ext/atomic\"";
 }

test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs

@@ -125,7 +125,7 @@ public async Task Cannot_create_resource_with_invalid_attribute_value()
  ErrorObject error = responseDocument.Errors[0];
  error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
  error.Title.Should().Be("Input validation failed.");
- error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");
+ error.Detail.Should().Be(@"The field Name must match the regular expression '^[\w\s]+$'.");
  error.Source.ShouldNotBeNull();
  error.Source.Pointer.Should().Be("/data/attributes/directoryName");
  }
@@ -534,7 +534,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
  ErrorObject error = responseDocument.Errors[0];
  error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
  error.Title.Should().Be("Input validation failed.");
- error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");
+ error.Detail.Should().Be(@"The field Name must match the regular expression '^[\w\s]+$'.");
  error.Source.ShouldNotBeNull();
  error.Source.Pointer.Should().Be("/data/attributes/directoryName");
  }

test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingTests.cs

@@ -74,8 +74,8 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
  await dbContext.SaveChangesAsync();
  });
 
- string route = $"/public-api/swimming-pools/{pool.StringId}/water-slides" +
- "?filter=greaterThan(length-in-meters,'1')&fields[water-slides]=length-in-meters";
+ string route =
+ $"/public-api/swimming-pools/{pool.StringId}/water-slides?filter=greaterThan(length-in-meters,'1')&fields[water-slides]=length-in-meters";
 
  // Act
  (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);

test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingTests.cs

@@ -79,7 +79,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
  await dbContext.SaveChangesAsync();
  });
 
- string route = $"/PublicApi/SwimmingPools/{pool.StringId}/WaterSlides" + "?filter=greaterThan(LengthInMeters,'1')&fields[WaterSlides]=LengthInMeters";
+ string route = $"/PublicApi/SwimmingPools/{pool.StringId}/WaterSlides?filter=greaterThan(LengthInMeters,'1')&fields[WaterSlides]=LengthInMeters";
 
  // Act
  (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);

test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs

@@ -323,10 +323,10 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
 
  responseDocument.Links.ShouldNotBeNull();
  responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
- responseDocument.Links.First.Should().Be(basePath + "?page%5Bsize%5D=1");
+ responseDocument.Links.First.Should().Be($"{basePath}?page%5Bsize%5D=1");
  responseDocument.Links.Last.Should().BeNull();
  responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
- responseDocument.Links.Next.Should().Be(basePath + "?page%5Bnumber%5D=3&page%5Bsize%5D=1");
+ responseDocument.Links.Next.Should().Be($"{basePath}?page%5Bnumber%5D=3&page%5Bsize%5D=1");
  }
 
  [Fact]

test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs

@@ -684,7 +684,7 @@ public async Task Cannot_create_resource_on_unknown_resource_type_in_url()
  }
  };
 
- const string route = "/" + Unknown.ResourceType;
+ const string route = $"/{Unknown.ResourceType}";
 
  // Act
  (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);

test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs

@@ -62,7 +62,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
  public async Task Cannot_get_primary_resources_for_unknown_type()
  {
  // Arrange
- const string route = "/" + Unknown.ResourceType;
+ const string route = $"/{Unknown.ResourceType}";
 
  // Act
  (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);

test/JsonApiDotNetCoreTests/UnitTests/Queries/QueryExpressionRewriterTests.cs

@@ -53,7 +53,7 @@ public void VisitInclude(string expressionText, string expectedTypes)
 
  // Assert
  List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
- List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
+ List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
 
  visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
  visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);
@@ -76,7 +76,7 @@ public void VisitSparseFieldSet(string expressionText, string expectedTypes)
 
  // Assert
  List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
- List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
+ List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
 
  visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
  visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);
@@ -136,7 +136,7 @@ public void VisitFilter(string expressionText, string expectedTypes)
 
  // Assert
  List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
- List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
+ List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
 
  visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
  visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);
@@ -160,7 +160,7 @@ public void VisitSort(string expressionText, string expectedTypes)
 
  // Assert
  List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
- List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
+ List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
 
  visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
  visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);
@@ -183,7 +183,7 @@ public void VisitPagination(string expressionText, string expectedTypes)
 
  // Assert
  List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
- List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
+ List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
 
  visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
  visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);
@@ -208,7 +208,7 @@ public void VisitParameterScope(string expressionText, string expectedTypes)
 
  // Assert
  List<string> visitedTypeNames = rewriter.ExpressionsVisited.Select(queryExpression => queryExpression.GetType().Name).ToList();
- List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => type + "Expression").ToList();
+ List<string> expectedTypeNames = expectedTypes.Split(',').Select(type => $"{type}Expression").ToList();
 
  visitedTypeNames.Should().ContainInOrder(expectedTypeNames);
  visitedTypeNames.Should().HaveCount(expectedTypeNames.Count);

test/JsonApiDotNetCoreTests/UnitTests/ResourceDefinitions/CreateSortExpressionFromLambdaTests.cs

@@ -317,7 +317,7 @@ public void Cannot_convert_concatenation_operator()
  // Act
  Action action = () => resourceDefinition.GetSortExpressionFromLambda(new JsonApiResourceDefinition<FileEntry, long>.PropertySortOrder
  {
- (file => file.Name + ":" + file.Content, ListSortDirection.Ascending)
+ (file => $"{file.Name}:{file.Content}", ListSortDirection.Ascending)
  });
 
  // Assert