Merge pull request #6283 from elsa-workflows/fix/array-wf-type
Refactor array type handling in variable and JSON converters
This commit is contained in:
commit
e395361bfd
|
|
@ -36,7 +36,7 @@ public class TypeJsonConverter : JsonConverter<Type>
|
|||
{
|
||||
var elementTypeAlias = typeAlias[..^"[]".Length];
|
||||
var elementType = _wellKnownTypeRegistry.TryGetType(elementTypeAlias, out var t) ? t : Type.GetType(elementTypeAlias)!;
|
||||
return typeof(List<>).MakeGenericType(elementType);
|
||||
return elementType.MakeArrayType();
|
||||
}
|
||||
|
||||
return _wellKnownTypeRegistry.TryGetType(typeAlias, out var type) ? type : Type.GetType(typeAlias);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public class VariableDefinitionMapper
|
|||
if (!_wellKnownTypeRegistry.TryGetTypeOrDefault(source.TypeName, out var type))
|
||||
return null;
|
||||
|
||||
var valueType = source.IsArray ? typeof(ICollection<>).MakeGenericType(type) : type;
|
||||
var valueType = source.IsArray ? type.MakeArrayType() : type;
|
||||
var variableGenericType = typeof(Variable<>).MakeGenericType(valueType);
|
||||
var variable = (Variable)Activator.CreateInstance(variableGenericType)!;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue