Apply suggestions from code review

Co-authored-by: Stephen Toub <[email protected]>

Author: aaronpowell

src/ModelContextProtocol/Protocol/Types/Resource.cs

@@ -42,7 +42,6 @@ public record Resource
     /// This can be used by Hosts to display file sizes and estimate context window usage.
     /// </summary>
     [JsonPropertyName("size")]
-
     public long? Size { get; init; }
 
     /// <summary>

src/ModelContextProtocol/Protocol/Types/ResourceContents.cs

@@ -52,20 +52,15 @@ public class ResourceContentsConverter : JsonConverter<ResourceContents>
         string? blob = null;
         string? text = null;
 
-        while (reader.Read())
+        while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
         {
-            if (reader.TokenType == JsonTokenType.EndObject)
-            {
-                break;
-            }
-
-            string? propertyName = reader.GetString();
-
-            if (propertyName == null)
+            if (reader.TokenType != JsonTokenType.PropertyName)
             {
                 continue;
             }
 
+            string propertyName = reader.GetString();
+
             switch (propertyName)
             {
                 case "uri":
@@ -94,6 +89,7 @@ public class ResourceContentsConverter : JsonConverter<ResourceContents>
                 Blob = blob
             };
         }
+
         if (text is not null)
         {
             return new TextResourceContents
@@ -103,6 +99,7 @@ public class ResourceContentsConverter : JsonConverter<ResourceContents>
                 Text = text
             };
         }
+
         return null;
     }
 
@@ -118,6 +115,7 @@ public override void Write(Utf8JsonWriter writer, ResourceContents value, JsonSe
         writer.WriteStartObject();
         writer.WriteString("uri", value.Uri);
         writer.WriteString("mimeType", value.MimeType);
+        Debug.Assert(value is BlobResourceContents or TextResourceContents);
         if (value is BlobResourceContents blobResource)
         {
             writer.WriteString("blob", blobResource.Blob);

tests/ModelContextProtocol.Tests/Server/McpServerResourceTests.cs

@@ -3,6 +3,7 @@
 using ModelContextProtocol.Server;
 
 namespace ModelContextProtocol.Tests.Server;
+
 public class McpServerResourceTests
 {
     [Fact]