Optimize StringBuilder calls to avoid calling ToString() twice, remove redundant PublicName in interpolations

bkoelman · bkoelman · commit 2bbf36cc06ad · 2025-08-28T01:29:28.000+02:00
diff --git a/src/Examples/DapperExample/TranslationToSql/Builders/SelectStatementBuilder.cs b/src/Examples/DapperExample/TranslationToSql/Builders/SelectStatementBuilder.cs
@@ -552,7 +552,7 @@ public override SqlTreeNode VisitResourceFieldChain(ResourceFieldChainExpression
                     throw new JsonApiException(new ErrorObject(HttpStatusCode.BadRequest)
                     {
                         Title = "Sorting or filtering on the requested attribute is unavailable.",
-                        Detail = $"Sorting or filtering on attribute '{attribute.PublicName}' is unavailable because it is unmapped."
+                        Detail = $"Sorting or filtering on attribute '{attribute}' is unavailable because it is unmapped."
                     });
                 }
 
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs
@@ -130,7 +130,7 @@ private static void ValidateAttributesInDerivedType(ResourceType resourceType)
             if (resourceType.FindAttributeByPublicName(attribute.PublicName) == null)
             {
                 throw new InvalidConfigurationException(
-                    $"Attribute '{attribute.PublicName}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");
+                    $"Attribute '{attribute}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");
             }
         }
     }
@@ -142,7 +142,7 @@ private static void ValidateRelationshipsInDerivedType(ResourceType resourceType
             if (resourceType.FindRelationshipByPublicName(relationship.PublicName) == null)
             {
                 throw new InvalidConfigurationException(
-                    $"Relationship '{relationship.PublicName}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");
+                    $"Relationship '{relationship}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");
             }
         }
     }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs
@@ -56,7 +56,7 @@ private string InnerToString(bool toFullString)
 
         builder.Append(Keywords.Any);
         builder.Append('(');
-        builder.Append(toFullString ? TargetAttribute.ToFullString() : TargetAttribute);
+        builder.Append(toFullString ? TargetAttribute.ToFullString() : TargetAttribute.ToString());
         builder.Append(',');
         builder.Append(string.Join(',', Constants.Select(constant => toFullString ? constant.ToFullString() : constant.ToString()).OrderBy(value => value)));
         builder.Append(')');
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/HasExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/HasExpression.cs
@@ -58,12 +58,12 @@ private string InnerToString(bool toFullString)
         var builder = new StringBuilder();
         builder.Append(Keywords.Has);
         builder.Append('(');
-        builder.Append(toFullString ? TargetCollection.ToFullString() : TargetCollection);
+        builder.Append(toFullString ? TargetCollection.ToFullString() : TargetCollection.ToString());
 
         if (Filter != null)
         {
             builder.Append(',');
-            builder.Append(toFullString ? Filter.ToFullString() : Filter);
+            builder.Append(toFullString ? Filter.ToFullString() : Filter.ToString());
         }
 
         builder.Append(')');
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/IncludeElementExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/IncludeElementExpression.cs
@@ -57,7 +57,7 @@ public override string ToFullString()
     private string InnerToString(bool toFullString)
     {
         var builder = new StringBuilder();
-        builder.Append(toFullString ? $"{Relationship.LeftType.PublicName}:{Relationship.PublicName}" : Relationship.PublicName);
+        builder.Append(toFullString ? $"{Relationship.LeftType}:{Relationship}" : Relationship.ToString());
 
         if (Children.Count > 0)
         {
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/IsTypeExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/IsTypeExpression.cs
@@ -71,7 +71,7 @@ private string InnerToString(bool toFullString)
 
         if (TargetToOneRelationship != null)
         {
-            builder.Append(toFullString ? TargetToOneRelationship.ToFullString() : TargetToOneRelationship);
+            builder.Append(toFullString ? TargetToOneRelationship.ToFullString() : TargetToOneRelationship.ToString());
         }
 
         builder.Append(',');
@@ -80,7 +80,7 @@ private string InnerToString(bool toFullString)
         if (Child != null)
         {
             builder.Append(',');
-            builder.Append(toFullString ? Child.ToFullString() : Child);
+            builder.Append(toFullString ? Child.ToFullString() : Child.ToString());
         }
 
         builder.Append(')');
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/MatchTextExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/MatchTextExpression.cs
@@ -72,7 +72,7 @@ private string InnerToString(bool toFullString)
 
         builder.Append(toFullString
             ? string.Join(',', TargetAttribute.ToFullString(), TextValue.ToFullString())
-            : string.Join(',', TargetAttribute, TextValue));
+            : string.Join(',', TargetAttribute.ToString(), TextValue.ToString()));
 
         builder.Append(')');
 
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/ResourceFieldChainExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/ResourceFieldChainExpression.cs
@@ -45,12 +45,12 @@ public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgum
 
     public override string ToString()
     {
-        return string.Join('.', Fields.Select(field => field.PublicName));
+        return string.Join('.', Fields.Select(field => field.ToString()));
     }
 
     public override string ToFullString()
     {
-        return string.Join('.', Fields.Select(field => $"{field.Type.PublicName}:{field.PublicName}"));
+        return string.Join('.', Fields.Select(field => field.ToFullString()));
     }
 
     public override bool Equals(object? obj)
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/SortElementExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/SortElementExpression.cs
@@ -59,7 +59,7 @@ private string InnerToString(bool toFullString)
             builder.Append('-');
         }
 
-        builder.Append(toFullString ? Target.ToFullString() : Target);
+        builder.Append(toFullString ? Target.ToFullString() : Target.ToString());
 
         return builder.ToString();
     }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpression.cs
@@ -33,12 +33,12 @@ public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgum
 
     public override string ToString()
     {
-        return string.Join(',', Fields.Select(field => field.PublicName).OrderBy(name => name));
+        return string.Join(',', Fields.Select(field => field.ToString()).OrderBy(name => name));
     }
 
     public override string ToFullString()
     {
-        return string.Join(',', Fields.Select(field => $"{field.Type.PublicName}:{field.PublicName}").OrderBy(name => name));
+        return string.Join(',', Fields.Select(field => $"{field.ToFullString()}").OrderBy(name => name));
     }
 
     public override bool Equals(object? obj)
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldTableExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldTableExpression.cs
@@ -49,9 +49,9 @@ private string InnerToString(bool toFullString)
                 builder.Append(',');
             }
 
-            builder.Append(resourceType.PublicName);
+            builder.Append(resourceType);
             builder.Append('(');
-            builder.Append(toFullString ? fieldSet.ToFullString() : fieldSet);
+            builder.Append(toFullString ? fieldSet.ToFullString() : fieldSet.ToString());
             builder.Append(')');
         }
 
diff --git a/src/JsonApiDotNetCore/Queries/Parsing/FilterParser.cs b/src/JsonApiDotNetCore/Queries/Parsing/FilterParser.cs
@@ -452,7 +452,7 @@ private static ResourceType ResolveDerivedType(ResourceType baseType, string der
 
         if (derivedType == null)
         {
-            throw new QueryParseException($"Resource type '{derivedTypeName}' does not exist or does not derive from '{baseType.PublicName}'.", position);
+            throw new QueryParseException($"Resource type '{derivedTypeName}' does not exist or does not derive from '{baseType}'.", position);
         }
 
         return derivedType;
@@ -571,7 +571,7 @@ protected override void ValidateField(ResourceFieldAttribute field, int position
         if (field.IsFilterBlocked())
         {
             string kind = field is AttrAttribute ? "attribute" : "relationship";
-            throw new QueryParseException($"Filtering on {kind} '{field.PublicName}' is not allowed.", position);
+            throw new QueryParseException($"Filtering on {kind} '{field}' is not allowed.", position);
         }
     }
 
diff --git a/src/JsonApiDotNetCore/Queries/Parsing/SortParser.cs b/src/JsonApiDotNetCore/Queries/Parsing/SortParser.cs
@@ -142,7 +142,7 @@ protected override void ValidateField(ResourceFieldAttribute field, int position
 
         if (field is AttrAttribute attribute && !attribute.Capabilities.HasFlag(AttrCapabilities.AllowSort))
         {
-            throw new QueryParseException($"Sorting on attribute '{attribute.PublicName}' is not allowed.", position);
+            throw new QueryParseException($"Sorting on attribute '{attribute}' is not allowed.", position);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Parsing/SparseFieldSetParser.cs b/src/JsonApiDotNetCore/Queries/Parsing/SparseFieldSetParser.cs
@@ -55,7 +55,7 @@ protected override void ValidateField(ResourceFieldAttribute field, int position
         if (field.IsViewBlocked())
         {
             string kind = field is AttrAttribute ? "attribute" : "relationship";
-            throw new QueryParseException($"Retrieving the {kind} '{field.PublicName}' is not allowed.", position);
+            throw new QueryParseException($"Retrieving the {kind} '{field}' is not allowed.", position);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentityAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentityAdapter.cs
@@ -86,8 +86,8 @@ private static void AssertIsCompatibleResourceType(ResourceType actual, Resource
         if (expected != null && !expected.ClrType.IsAssignableFrom(actual.ClrType))
         {
             string message = relationshipName != null
-                ? $"Type '{actual.PublicName}' is not convertible to type '{expected.PublicName}' of relationship '{relationshipName}'."
-                : $"Type '{actual.PublicName}' is not convertible to type '{expected.PublicName}'.";
+                ? $"Type '{actual}' is not convertible to type '{expected}' of relationship '{relationshipName}'."
+                : $"Type '{actual}' is not convertible to type '{expected}'.";
 
             throw new ModelConversionException(state.Position, "Incompatible resource type found.", message, HttpStatusCode.Conflict);
         }
@@ -245,7 +245,7 @@ protected static void AssertIsKnownRelationship([NotNull] RelationshipAttribute?
         if (relationship == null)
         {
             throw new ModelConversionException(state.Position, "Unknown relationship found.",
-                $"Relationship '{relationshipName}' does not exist on resource type '{resourceType.PublicName}'.");
+                $"Relationship '{relationshipName}' does not exist on resource type '{resourceType}'.");
         }
     }
 
@@ -262,7 +262,7 @@ protected internal static void AssertToManyInAddOrRemoveRelationship(Relationshi
                 ? "Only to-many relationships can be targeted through this operation."
                 : "Only to-many relationships can be targeted through this endpoint.";
 
-            throw new ModelConversionException(state.Position, message, $"Relationship '{relationship.PublicName}' is not a to-many relationship.",
+            throw new ModelConversionException(state.Position, message, $"Relationship '{relationship}' is not a to-many relationship.",
                 HttpStatusCode.Forbidden);
         }
     }
@@ -294,7 +294,7 @@ private static void AssertSetRelationshipNotBlocked(RelationshipAttribute relati
         if (relationship.IsSetBlocked())
         {
             throw new ModelConversionException(state.Position, "Relationship cannot be assigned.",
-                $"The relationship '{relationship.PublicName}' on resource type '{relationship.LeftType.PublicName}' cannot be assigned to.");
+                $"The relationship '{relationship}' on resource type '{relationship.LeftType}' cannot be assigned to.");
         }
     }
 
@@ -303,7 +303,7 @@ private static void AssertAddToRelationshipNotBlocked(HasManyAttribute relations
         if (!relationship.Capabilities.HasFlag(HasManyCapabilities.AllowAdd))
         {
             throw new ModelConversionException(state.Position, "Relationship cannot be added to.",
-                $"The relationship '{relationship.PublicName}' on resource type '{relationship.LeftType.PublicName}' cannot be added to.");
+                $"The relationship '{relationship}' on resource type '{relationship.LeftType}' cannot be added to.");
         }
     }
 
@@ -312,7 +312,7 @@ private static void AssertRemoveFromRelationshipNotBlocked(HasManyAttribute rela
         if (!relationship.Capabilities.HasFlag(HasManyCapabilities.AllowRemove))
         {
             throw new ModelConversionException(state.Position, "Relationship cannot be removed from.",
-                $"The relationship '{relationship.PublicName}' on resource type '{relationship.LeftType.PublicName}' cannot be removed from.");
+                $"The relationship '{relationship}' on resource type '{relationship.LeftType}' cannot be removed from.");
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceObjectAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceObjectAdapter.cs
@@ -76,7 +76,7 @@ private static void AssertIsKnownAttribute([NotNull] AttrAttribute? attr, string
         if (attr == null)
         {
             throw new ModelConversionException(state.Position, "Unknown attribute found.",
-                $"Attribute '{attributeName}' does not exist on resource type '{resourceType.PublicName}'.");
+                $"Attribute '{attributeName}' does not exist on resource type '{resourceType}'.");
         }
     }
 
@@ -101,7 +101,7 @@ private static void AssertSetAttributeInCreateResourceNotBlocked(AttrAttribute a
         if (state.Request.WriteOperation == WriteOperationKind.CreateResource && !attr.Capabilities.HasFlag(AttrCapabilities.AllowCreate))
         {
             throw new ModelConversionException(state.Position, "Attribute value cannot be assigned when creating resource.",
-                $"The attribute '{attr.PublicName}' on resource type '{resourceType.PublicName}' cannot be assigned to.");
+                $"The attribute '{attr}' on resource type '{resourceType}' cannot be assigned to.");
         }
     }
 
@@ -110,7 +110,7 @@ private static void AssertSetAttributeInUpdateResourceNotBlocked(AttrAttribute a
         if (state.Request.WriteOperation == WriteOperationKind.UpdateResource && !attr.Capabilities.HasFlag(AttrCapabilities.AllowChange))
         {
             throw new ModelConversionException(state.Position, "Attribute value cannot be assigned when updating resource.",
-                $"The attribute '{attr.PublicName}' on resource type '{resourceType.PublicName}' cannot be assigned to.");
+                $"The attribute '{attr}' on resource type '{resourceType}' cannot be assigned to.");
         }
     }
 
@@ -119,7 +119,7 @@ private static void AssertNotReadOnly(AttrAttribute attr, ResourceType resourceT
         if (attr.Property.SetMethod == null)
         {
             throw new ModelConversionException(state.Position, "Attribute is read-only.",
-                $"Attribute '{attr.PublicName}' on resource type '{resourceType.PublicName}' is read-only.");
+                $"Attribute '{attr}' on resource type '{resourceType}' is read-only.");
         }
     }
 
diff --git a/src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs b/src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs
@@ -244,7 +244,7 @@ public override string ToString()
         }
         else if (_childrenByRelationship != null)
         {
-            builder.Append($", children: {string.Join(',', _childrenByRelationship.Select(pair => $"{pair.Key.PublicName} ({pair.Value.Count})"))}");
+            builder.Append($", children: {string.Join(',', _childrenByRelationship.Select(pair => $"{pair.Key} ({pair.Value.Count})"))}");
         }
 
         return builder.ToString();

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ public override SqlTreeNode VisitResourceFieldChain(ResourceFieldChainExpression`
`552`	`552`	`throw new JsonApiException(new ErrorObject(HttpStatusCode.BadRequest)`
`553`	`553`	`{`
`554`	`554`	`Title = "Sorting or filtering on the requested attribute is unavailable.",`
`555`		`- Detail = $"Sorting or filtering on attribute '{attribute.PublicName}' is unavailable because it is unmapped."`
	`555`	`+ Detail = $"Sorting or filtering on attribute '{attribute}' is unavailable because it is unmapped."`
`556`	`556`	`});`
`557`	`557`	`}`
`558`	`558`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ private static void ValidateAttributesInDerivedType(ResourceType resourceType)`
`130`	`130`	`if (resourceType.FindAttributeByPublicName(attribute.PublicName) == null)`
`131`	`131`	`{`
`132`	`132`	`throw new InvalidConfigurationException(`
`133`		`- $"Attribute '{attribute.PublicName}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");`
	`133`	`+ $"Attribute '{attribute}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`	`}`
`@@ -142,7 +142,7 @@ private static void ValidateRelationshipsInDerivedType(ResourceType resourceType`
`142`	`142`	`if (resourceType.FindRelationshipByPublicName(relationship.PublicName) == null)`
`143`	`143`	`{`
`144`	`144`	`throw new InvalidConfigurationException(`
`145`		`- $"Relationship '{relationship.PublicName}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");`
	`145`	`+ $"Relationship '{relationship}' from base type '{resourceType.BaseType.ClrType}' does not exist in derived type '{resourceType.ClrType}'.");`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,12 @@ private string InnerToString(bool toFullString)`
`58`	`58`	`var builder = new StringBuilder();`
`59`	`59`	`builder.Append(Keywords.Has);`
`60`	`60`	`builder.Append('(');`
`61`		`- builder.Append(toFullString ? TargetCollection.ToFullString() : TargetCollection);`
	`61`	`+ builder.Append(toFullString ? TargetCollection.ToFullString() : TargetCollection.ToString());`
`62`	`62`
`63`	`63`	`if (Filter != null)`
`64`	`64`	`{`
`65`	`65`	`builder.Append(',');`
`66`		`- builder.Append(toFullString ? Filter.ToFullString() : Filter);`
	`66`	`+ builder.Append(toFullString ? Filter.ToFullString() : Filter.ToString());`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`builder.Append(')');`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public override string ToFullString()`
`57`	`57`	`private string InnerToString(bool toFullString)`
`58`	`58`	`{`
`59`	`59`	`var builder = new StringBuilder();`
`60`		`- builder.Append(toFullString ? $"{Relationship.LeftType.PublicName}:{Relationship.PublicName}" : Relationship.PublicName);`
	`60`	`+ builder.Append(toFullString ? $"{Relationship.LeftType}:{Relationship}" : Relationship.ToString());`
`61`	`61`
`62`	`62`	`if (Children.Count > 0)`
`63`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private string InnerToString(bool toFullString)`
`71`	`71`
`72`	`72`	`if (TargetToOneRelationship != null)`
`73`	`73`	`{`
`74`		`- builder.Append(toFullString ? TargetToOneRelationship.ToFullString() : TargetToOneRelationship);`
	`74`	`+ builder.Append(toFullString ? TargetToOneRelationship.ToFullString() : TargetToOneRelationship.ToString());`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`builder.Append(',');`
`@@ -80,7 +80,7 @@ private string InnerToString(bool toFullString)`
`80`	`80`	`if (Child != null)`
`81`	`81`	`{`
`82`	`82`	`builder.Append(',');`
`83`		`- builder.Append(toFullString ? Child.ToFullString() : Child);`
	`83`	`+ builder.Append(toFullString ? Child.ToFullString() : Child.ToString());`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`builder.Append(')');`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgum`
`45`	`45`
`46`	`46`	`public override string ToString()`
`47`	`47`	`{`
`48`		`- return string.Join('.', Fields.Select(field => field.PublicName));`
	`48`	`+ return string.Join('.', Fields.Select(field => field.ToString()));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public override string ToFullString()`
`52`	`52`	`{`
`53`		`- return string.Join('.', Fields.Select(field => $"{field.Type.PublicName}:{field.PublicName}"));`
	`53`	`+ return string.Join('.', Fields.Select(field => field.ToFullString()));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public override bool Equals(object? obj)`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ private string InnerToString(bool toFullString)`
`59`	`59`	`builder.Append('-');`
`60`	`60`	`}`
`61`	`61`
`62`		`- builder.Append(toFullString ? Target.ToFullString() : Target);`
	`62`	`+ builder.Append(toFullString ? Target.ToFullString() : Target.ToString());`
`63`	`63`
`64`	`64`	`return builder.ToString();`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgum`
`33`	`33`
`34`	`34`	`public override string ToString()`
`35`	`35`	`{`
`36`		`- return string.Join(',', Fields.Select(field => field.PublicName).OrderBy(name => name));`
	`36`	`+ return string.Join(',', Fields.Select(field => field.ToString()).OrderBy(name => name));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public override string ToFullString()`
`40`	`40`	`{`
`41`		`- return string.Join(',', Fields.Select(field => $"{field.Type.PublicName}:{field.PublicName}").OrderBy(name => name));`
	`41`	`+ return string.Join(',', Fields.Select(field => $"{field.ToFullString()}").OrderBy(name => name));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public override bool Equals(object? obj)`