.NET Format Style Fixes
This commit is contained in:
@@ -4,7 +4,6 @@ using System.Text.Json.Serialization;
|
||||
|
||||
namespace SPTarkov.Server.Core.Utils.Json.Converters;
|
||||
|
||||
|
||||
public class EftEnumConverterFactory : JsonConverterFactory
|
||||
{
|
||||
public override bool CanConvert(Type typeToConvert)
|
||||
@@ -18,13 +17,10 @@ public class EftEnumConverterFactory : JsonConverterFactory
|
||||
)
|
||||
{
|
||||
return (JsonConverter)
|
||||
Activator.CreateInstance(
|
||||
typeof(EftEnumConverter<>).MakeGenericType(typeToConvert)
|
||||
);
|
||||
Activator.CreateInstance(typeof(EftEnumConverter<>).MakeGenericType(typeToConvert));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public class EftEnumConverter<T> : JsonConverter<T>
|
||||
{
|
||||
private static readonly JsonSerializerOptions _options = new()
|
||||
|
||||
@@ -7,9 +7,10 @@ public class EftListEnumConverterFactory : JsonConverterFactory
|
||||
{
|
||||
public override bool CanConvert(Type typeToConvert)
|
||||
{
|
||||
return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(List<>) &&
|
||||
typeToConvert.GenericTypeArguments[0].IsEnum &&
|
||||
(typeToConvert.GenericTypeArguments[0].Namespace?.Contains("SPTarkov") ?? false);
|
||||
return typeToConvert.IsGenericType
|
||||
&& typeToConvert.GetGenericTypeDefinition() == typeof(List<>)
|
||||
&& typeToConvert.GenericTypeArguments[0].IsEnum
|
||||
&& (typeToConvert.GenericTypeArguments[0].Namespace?.Contains("SPTarkov") ?? false);
|
||||
}
|
||||
|
||||
public override JsonConverter? CreateConverter(
|
||||
@@ -19,7 +20,9 @@ public class EftListEnumConverterFactory : JsonConverterFactory
|
||||
{
|
||||
return (JsonConverter)
|
||||
Activator.CreateInstance(
|
||||
typeof(EftListEnumConverter<>).MakeGenericType(typeToConvert.GenericTypeArguments[0])
|
||||
typeof(EftListEnumConverter<>).MakeGenericType(
|
||||
typeToConvert.GenericTypeArguments[0]
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +36,9 @@ public class EnumerableConverter<T> : JsonConverter<IEnumerable<T>?>
|
||||
case JsonTokenType.String:
|
||||
case JsonTokenType.Number:
|
||||
case JsonTokenType.StartObject:
|
||||
throw new Exception($"Error attempting to deserialize object, its not a valid array. Type {reader.TokenType}");
|
||||
throw new Exception(
|
||||
$"Error attempting to deserialize object, its not a valid array. Type {reader.TokenType}"
|
||||
);
|
||||
|
||||
case JsonTokenType.StartArray:
|
||||
var list = JsonSerializer.Deserialize<List<T>>(ref reader, options);
|
||||
|
||||
@@ -20,7 +20,7 @@ public class SptJsonConverterRegistrator : IJsonConverterRegistrator
|
||||
new StringToMongoIdConverter(),
|
||||
new EftEnumConverterFactory(),
|
||||
new EftListEnumConverterFactory(),
|
||||
new EnumerableConverterFactory()
|
||||
new EnumerableConverterFactory(),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user