Parse empty strings as nullable Guid

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.3] - 2024-04-25
+
+### Changed
+
+- Parse empty strings as nullable Guid
+
 ## [1.2.2] - 2024-04-19
 
 ### Changed

Microsoft.Kiota.Serialization.Json.Tests/JsonParseNodeTests.cs

@@ -220,6 +220,23 @@ public void ParseGuidWithoutConverter()
             Assert.Equal(id, entity.Id);
         }
 
+        [Fact]
+        public void ParseGuidEmptyString()
+        {
+            // Arrange
+            var json = $"{{\"id\": \"\"}}";
+            var serializerOptions = new JsonSerializerOptions(JsonSerializerDefaults.General);
+            var serializationContext = new KiotaJsonSerializationContext(serializerOptions);
+            using var jsonDocument = JsonDocument.Parse(json);
+            var rootParseNode = new JsonParseNode(jsonDocument.RootElement, serializationContext);
+
+            // Act
+            var entity = rootParseNode.GetObjectValue(_ => new ConverterTestEntity());
+
+            // Assert
+            Assert.Null(entity.Id);
+        }
+
         [Fact]
         public void GetEntityWithUntypedNodesFromJson()
         {

src/JsonParseNode.cs

@@ -125,9 +125,19 @@ public JsonParseNode(JsonElement node, KiotaJsonSerializationContext jsonSeriali
         /// Get the guid value from the json node
         /// </summary>
         /// <returns>A guid value</returns>
-        public Guid? GetGuidValue() => _jsonNode.ValueKind == JsonValueKind.String 
-            ? _jsonNode.Deserialize(_jsonSerializerContext.Guid)
-            : null;
+        public Guid? GetGuidValue()
+        {
+            if(_jsonNode.ValueKind != JsonValueKind.String)
+                return null;
+
+            if(_jsonNode.TryGetGuid(out var guid))
+                return guid;
+
+            if(string.IsNullOrEmpty(_jsonNode.GetString()))
+                return null;
+
+            return _jsonNode.Deserialize(_jsonSerializerContext.Guid);
+        }
 
         /// <summary>
         /// Get the <see cref="DateTimeOffset"/> value from the json node

src/Microsoft.Kiota.Serialization.Json.csproj

@@ -15,7 +15,7 @@
     <PackageProjectUrl>https://aka.ms/kiota/docs</PackageProjectUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <Deterministic>true</Deterministic>
-    <VersionPrefix>1.2.2</VersionPrefix>
+    <VersionPrefix>1.2.3</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>