fix(Sdk): Fixed YAML serializers and deserializers

cdavernas · cdavernas · commit 0c7aabb527a9 · 2024-09-08T11:27:18.000+02:00
Signed-off-by: Charles d'Avernas &lt;charles.davernas@neuroglia.io&gt;
diff --git a/src/ServerlessWorkflow.Sdk/Models/Authentication/OAuth2AuthenticationEndpointsDefinition.cs b/src/ServerlessWorkflow.Sdk/Models/Authentication/OAuth2AuthenticationEndpointsDefinition.cs
@@ -25,20 +25,20 @@ public record OAuth2AuthenticationEndpointsDefinition
     /// </summary>
     [Required]
     [DataMember(Name = "authority", Order = 1), JsonPropertyName("authority"), JsonPropertyOrder(1), YamlMember(Alias = "authority", Order = 1)]
-    public virtual Uri Token { get; set; } = new("/oauth2/token");
+    public virtual Uri Token { get; set; } = new("/oauth2/token", UriKind.RelativeOrAbsolute);
 
     /// <summary>
     /// Gets/sets the relative path to the revocation endpoint. Defaults to `/oauth2/revoke`
     /// </summary>
     [Required]
     [DataMember(Name = "revocation", Order = 2), JsonPropertyName("revocation"), JsonPropertyOrder(2), YamlMember(Alias = "revocation", Order = 2)]
-    public virtual Uri Revocation { get; set; } = new("/oauth2/revoke");
+    public virtual Uri Revocation { get; set; } = new("/oauth2/revoke", UriKind.RelativeOrAbsolute);
 
     /// <summary>
     /// Gets/sets the relative path to the introspection endpoint. Defaults to `/oauth2/introspect`
     /// </summary>
     [Required]
     [DataMember(Name = "introspection", Order = 3), JsonPropertyName("introspection"), JsonPropertyOrder(3), YamlMember(Alias = "introspection", Order = 3)]
-    public virtual Uri Introspection { get; set; } = new("/oauth2/introspect");
+    public virtual Uri Introspection { get; set; } = new("/oauth2/introspect", UriKind.RelativeOrAbsolute);
 
 }
diff --git a/src/ServerlessWorkflow.Sdk/Models/ErrorCatcherDefinition.cs b/src/ServerlessWorkflow.Sdk/Models/ErrorCatcherDefinition.cs
@@ -53,7 +53,6 @@ public virtual RetryPolicyDefinition? Retry
         get => this.RetryValue?.T1Value;
         set
         {
-            ArgumentNullException.ThrowIfNull(value);
             this.RetryValue = value;
         }
     }
diff --git a/src/ServerlessWorkflow.Sdk/Serialization/Yaml/MapEntryYamlConverter.cs b/src/ServerlessWorkflow.Sdk/Serialization/Yaml/MapEntryYamlConverter.cs
@@ -30,10 +30,10 @@ public class MapEntryYamlConverter(Func<ISerializer> serializerFactory, Func<IDe
     public virtual bool Accepts(Type type) => type.IsGenericType && type.GetGenericTypeDefinition() == typeof(MapEntry<,>);
 
     /// <inheritdoc/>
-    public virtual object? ReadYaml(IParser parser, Type type) => this.CreateGenericConverter(type).ReadYaml(parser, type);
+    public virtual object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) => this.CreateGenericConverter(type).ReadYaml(parser, type, rootDeserializer);
 
     /// <inheritdoc/>
-    public virtual void WriteYaml(IEmitter emitter, object? value, Type type) => this.CreateGenericConverter(type).WriteYaml(emitter, value, type);
+    public virtual void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer rootSerializer) => this.CreateGenericConverter(type).WriteYaml(emitter, value, type, rootSerializer);
 
     /// <summary>
     /// Creates a new generic <see cref="MapEntryConverter{TKey, TValue}"/>
@@ -56,7 +56,7 @@ class MapEntryConverter<TKey, TValue> (ISerializer serializer, IDeserializer des
         public bool Accepts(Type type) => type == typeof(MapEntry<TKey, TValue>);
 
         /// <inheritdoc/>
-        public virtual object ReadYaml(IParser parser, Type type) 
+        public virtual object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) 
         {
             parser.Consume<MappingStart>();
             var key = deserializer.Deserialize<TKey>(parser);
@@ -66,7 +66,7 @@ public virtual object ReadYaml(IParser parser, Type type)
         }
 
         /// <inheritdoc/>
-        public virtual void WriteYaml(IEmitter emitter, object? value, Type type)
+        public virtual void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer rootSerializer)
         {
             if (value == null)
             {
diff --git a/src/ServerlessWorkflow.Sdk/Serialization/Yaml/OneOfConverter.cs b/src/ServerlessWorkflow.Sdk/Serialization/Yaml/OneOfConverter.cs
@@ -30,10 +30,10 @@ public class OneOfConverter
     public virtual bool Accepts(Type type) => type.GetGenericType(typeof(OneOf<,>)) != null;
 
     /// <inheritdoc/>
-    public virtual object? ReadYaml(IParser parser, Type type) => throw new NotImplementedException();
+    public virtual object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) => throw new NotImplementedException();
 
     /// <inheritdoc/>
-    public virtual void WriteYaml(IEmitter emitter, object? value, Type type)
+    public virtual void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer rootSerializer)
     {
         if (value == null || value is not IOneOf oneOf)
         {
@@ -47,7 +47,7 @@ public virtual void WriteYaml(IEmitter emitter, object? value, Type type)
             return;
         }
         var jsonNode = JsonSerializer.Default.SerializeToNode(toSerialize);
-        new JsonNodeTypeConverter().WriteYaml(emitter, jsonNode, toSerialize.GetType());
+        new JsonNodeTypeConverter().WriteYaml(emitter, jsonNode, toSerialize.GetType(), rootSerializer);
     }
 
 }
diff --git a/src/ServerlessWorkflow.Sdk/Serialization/Yaml/OneOfNodeDeserializer.cs b/src/ServerlessWorkflow.Sdk/Serialization/Yaml/OneOfNodeDeserializer.cs
@@ -31,10 +31,10 @@ public class OneOfNodeDeserializer(INodeDeserializer inner)
     protected INodeDeserializer Inner { get; } = inner;
 
     /// <inheritdoc/>
-    public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value)
+    public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value, ObjectDeserializer rootDeserializer)
     {
-        if (!typeof(IOneOf).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value);
-        if (!this.Inner.Deserialize(reader, typeof(Dictionary<object, object>), nestedObjectDeserializer, out value)) return false;
+        if (!typeof(IOneOf).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value, rootDeserializer);
+        if (!this.Inner.Deserialize(reader, typeof(Dictionary<object, object>), nestedObjectDeserializer, out value, rootDeserializer)) return false;
         value = JsonSerializer.Default.Deserialize(JsonSerializer.Default.SerializeToText(value!), expectedType);
         return true;
     }
diff --git a/src/ServerlessWorkflow.Sdk/Serialization/Yaml/OneOfScalarDeserializer.cs b/src/ServerlessWorkflow.Sdk/Serialization/Yaml/OneOfScalarDeserializer.cs
@@ -31,10 +31,10 @@ public class OneOfScalarDeserializer(INodeDeserializer inner)
     protected INodeDeserializer Inner { get; } = inner;
 
     /// <inheritdoc/>
-    public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value)
+    public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value, ObjectDeserializer rootDeserializer)
     {
-        if (!typeof(IOneOf).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value);
-        if (!this.Inner.Deserialize(reader, typeof(object), nestedObjectDeserializer, out value)) return false;
+        if (!typeof(IOneOf).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value, rootDeserializer);
+        if (!this.Inner.Deserialize(reader, typeof(object), nestedObjectDeserializer, out value, rootDeserializer)) return false;
         value = JsonSerializer.Default.Deserialize(JsonSerializer.Default.SerializeToText(value!), expectedType);
         return true;
     }
diff --git a/src/ServerlessWorkflow.Sdk/Serialization/Yaml/TaskDefinitionYamlConverter.cs b/src/ServerlessWorkflow.Sdk/Serialization/Yaml/TaskDefinitionYamlConverter.cs
@@ -34,10 +34,10 @@ public class TaskDefinitionYamlDeserializer(INodeDeserializer inner)
     protected INodeDeserializer Inner { get; } = inner;
     
     /// <inheritdoc/>
-    public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value)
+    public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value, ObjectDeserializer rootDeserializer)
     {
-        if (!typeof(TaskDefinition).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value);
-        if (!this.Inner.Deserialize(reader, typeof(Dictionary<object, object>), nestedObjectDeserializer, out value)) return false;
+        if (!typeof(TaskDefinition).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value, rootDeserializer);
+        if (!this.Inner.Deserialize(reader, typeof(Dictionary<object, object>), nestedObjectDeserializer, out value, rootDeserializer)) return false;
         value = JsonSerializer.Default.Deserialize<TaskDefinition>(JsonSerializer.Default.SerializeToText(value!));
         return true;
     }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ public virtual RetryPolicyDefinition? Retry`
`53`	`53`	`get => this.RetryValue?.T1Value;`
`54`	`54`	`set`
`55`	`55`	`{`
`56`		`- ArgumentNullException.ThrowIfNull(value);`
`57`	`56`	`this.RetryValue = value;`
`58`	`57`	`}`
`59`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ public class MapEntryYamlConverter(Func<ISerializer> serializerFactory, Func<IDe`
`30`	`30`	`public virtual bool Accepts(Type type) => type.IsGenericType && type.GetGenericTypeDefinition() == typeof(MapEntry<,>);`
`31`	`31`
`32`	`32`	`/// <inheritdoc/>`
`33`		`- public virtual object? ReadYaml(IParser parser, Type type) => this.CreateGenericConverter(type).ReadYaml(parser, type);`
	`33`	`+ public virtual object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) => this.CreateGenericConverter(type).ReadYaml(parser, type, rootDeserializer);`
`34`	`34`
`35`	`35`	`/// <inheritdoc/>`
`36`		`- public virtual void WriteYaml(IEmitter emitter, object? value, Type type) => this.CreateGenericConverter(type).WriteYaml(emitter, value, type);`
	`36`	`+ public virtual void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer rootSerializer) => this.CreateGenericConverter(type).WriteYaml(emitter, value, type, rootSerializer);`
`37`	`37`
`38`	`38`	`/// <summary>`
`39`	`39`	`/// Creates a new generic <see cref="MapEntryConverter{TKey, TValue}"/>`
`@@ -56,7 +56,7 @@ class MapEntryConverter<TKey, TValue> (ISerializer serializer, IDeserializer des`
`56`	`56`	`public bool Accepts(Type type) => type == typeof(MapEntry<TKey, TValue>);`
`57`	`57`
`58`	`58`	`/// <inheritdoc/>`
`59`		`- public virtual object ReadYaml(IParser parser, Type type)`
	`59`	`+ public virtual object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer)`
`60`	`60`	`{`
`61`	`61`	`parser.Consume<MappingStart>();`
`62`	`62`	`var key = deserializer.Deserialize<TKey>(parser);`
`@@ -66,7 +66,7 @@ public virtual object ReadYaml(IParser parser, Type type)`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/// <inheritdoc/>`
`69`		`- public virtual void WriteYaml(IEmitter emitter, object? value, Type type)`
	`69`	`+ public virtual void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer rootSerializer)`
`70`	`70`	`{`
`71`	`71`	`if (value == null)`
`72`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ public class OneOfConverter`
`30`	`30`	`public virtual bool Accepts(Type type) => type.GetGenericType(typeof(OneOf<,>)) != null;`
`31`	`31`
`32`	`32`	`/// <inheritdoc/>`
`33`		`- public virtual object? ReadYaml(IParser parser, Type type) => throw new NotImplementedException();`
	`33`	`+ public virtual object? ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeserializer) => throw new NotImplementedException();`
`34`	`34`
`35`	`35`	`/// <inheritdoc/>`
`36`		`- public virtual void WriteYaml(IEmitter emitter, object? value, Type type)`
	`36`	`+ public virtual void WriteYaml(IEmitter emitter, object? value, Type type, ObjectSerializer rootSerializer)`
`37`	`37`	`{`
`38`	`38`	`if (value == null \|\| value is not IOneOf oneOf)`
`39`	`39`	`{`
`@@ -47,7 +47,7 @@ public virtual void WriteYaml(IEmitter emitter, object? value, Type type)`
`47`	`47`	`return;`
`48`	`48`	`}`
`49`	`49`	`var jsonNode = JsonSerializer.Default.SerializeToNode(toSerialize);`
`50`		`- new JsonNodeTypeConverter().WriteYaml(emitter, jsonNode, toSerialize.GetType());`
	`50`	`+ new JsonNodeTypeConverter().WriteYaml(emitter, jsonNode, toSerialize.GetType(), rootSerializer);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ public class OneOfNodeDeserializer(INodeDeserializer inner)`
`31`	`31`	`protected INodeDeserializer Inner { get; } = inner;`
`32`	`32`
`33`	`33`	`/// <inheritdoc/>`
`34`		`- public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value)`
	`34`	`+ public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value, ObjectDeserializer rootDeserializer)`
`35`	`35`	`{`
`36`		`- if (!typeof(IOneOf).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value);`
`37`		`- if (!this.Inner.Deserialize(reader, typeof(Dictionary<object, object>), nestedObjectDeserializer, out value)) return false;`
	`36`	`+ if (!typeof(IOneOf).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value, rootDeserializer);`
	`37`	`+ if (!this.Inner.Deserialize(reader, typeof(Dictionary<object, object>), nestedObjectDeserializer, out value, rootDeserializer)) return false;`
`38`	`38`	`value = JsonSerializer.Default.Deserialize(JsonSerializer.Default.SerializeToText(value!), expectedType);`
`39`	`39`	`return true;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ public class OneOfScalarDeserializer(INodeDeserializer inner)`
`31`	`31`	`protected INodeDeserializer Inner { get; } = inner;`
`32`	`32`
`33`	`33`	`/// <inheritdoc/>`
`34`		`- public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value)`
	`34`	`+ public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value, ObjectDeserializer rootDeserializer)`
`35`	`35`	`{`
`36`		`- if (!typeof(IOneOf).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value);`
`37`		`- if (!this.Inner.Deserialize(reader, typeof(object), nestedObjectDeserializer, out value)) return false;`
	`36`	`+ if (!typeof(IOneOf).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value, rootDeserializer);`
	`37`	`+ if (!this.Inner.Deserialize(reader, typeof(object), nestedObjectDeserializer, out value, rootDeserializer)) return false;`
`38`	`38`	`value = JsonSerializer.Default.Deserialize(JsonSerializer.Default.SerializeToText(value!), expectedType);`
`39`	`39`	`return true;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ public class TaskDefinitionYamlDeserializer(INodeDeserializer inner)`
`34`	`34`	`protected INodeDeserializer Inner { get; } = inner;`
`35`	`35`
`36`	`36`	`/// <inheritdoc/>`
`37`		`- public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value)`
	`37`	`+ public virtual bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object?> nestedObjectDeserializer, out object? value, ObjectDeserializer rootDeserializer)`
`38`	`38`	`{`
`39`		`- if (!typeof(TaskDefinition).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value);`
`40`		`- if (!this.Inner.Deserialize(reader, typeof(Dictionary<object, object>), nestedObjectDeserializer, out value)) return false;`
	`39`	`+ if (!typeof(TaskDefinition).IsAssignableFrom(expectedType)) return this.Inner.Deserialize(reader, expectedType, nestedObjectDeserializer, out value, rootDeserializer);`
	`40`	`+ if (!this.Inner.Deserialize(reader, typeof(Dictionary<object, object>), nestedObjectDeserializer, out value, rootDeserializer)) return false;`
`41`	`41`	`value = JsonSerializer.Default.Deserialize<TaskDefinition>(JsonSerializer.Default.SerializeToText(value!));`
`42`	`42`	`return true;`
`43`	`43`	`}`