Skip to content

Commit a340de9

Browse files
committed
Top commit of all time
This is how you avoid doing breaking changes, kids
1 parent bf11cf8 commit a340de9

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

ArchiSteamFarm/Helpers/Json/JsonUtilities.cs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,46 +39,54 @@ namespace ArchiSteamFarm.Helpers.Json;
3939

4040
public static class JsonUtilities {
4141
[PublicAPI]
42-
public static readonly JsonSerializerOptions DefaultJsonSerialierOptions = CreateDefaultJsonSerializerOptions();
42+
public static readonly JsonSerializerOptions DefaultJsonSerializerOptions = CreateDefaultJsonSerializerOptions();
4343

4444
[PublicAPI]
45-
public static readonly JsonSerializerOptions IndentedJsonSerialierOptions = CreateDefaultJsonSerializerOptions(true);
45+
public static readonly JsonSerializerOptions IndentedJsonSerializerOptions = CreateDefaultJsonSerializerOptions(true);
46+
47+
// TODO: Remove me in the future
48+
[Obsolete($"Use {nameof(DefaultJsonSerializerOptions)} instead of this typo, thanks")]
49+
public static JsonSerializerOptions DefaultJsonSerialierOptions => DefaultJsonSerializerOptions;
50+
51+
// TODO: Remove me in the future
52+
[Obsolete($"Use {nameof(IndentedJsonSerializerOptions)} instead of this typo, thanks")]
53+
public static JsonSerializerOptions IndentedJsonSerialierOptions => IndentedJsonSerializerOptions;
4654

4755
[PublicAPI]
4856
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "We don't care about trimmed assemblies, as we need it to work only with the known (used) ones")]
4957
public static JsonElement ToJsonElement<T>(this T obj) where T : notnull {
5058
ArgumentNullException.ThrowIfNull(obj);
5159

52-
return JsonSerializer.SerializeToElement(obj, DefaultJsonSerialierOptions);
60+
return JsonSerializer.SerializeToElement(obj, DefaultJsonSerializerOptions);
5361
}
5462

5563
[PublicAPI]
5664
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "We don't care about trimmed assemblies, as we need it to work only with the known (used) ones")]
57-
public static T? ToJsonObject<T>(this JsonElement jsonElement) => jsonElement.Deserialize<T>(DefaultJsonSerialierOptions);
65+
public static T? ToJsonObject<T>(this JsonElement jsonElement) => jsonElement.Deserialize<T>(DefaultJsonSerializerOptions);
5866

5967
[PublicAPI]
6068
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "We don't care about trimmed assemblies, as we need it to work only with the known (used) ones")]
61-
public static T? ToJsonObject<T>(this JsonNode jsonNode) => jsonNode.Deserialize<T>(DefaultJsonSerialierOptions);
69+
public static T? ToJsonObject<T>(this JsonNode jsonNode) => jsonNode.Deserialize<T>(DefaultJsonSerializerOptions);
6270

6371
[PublicAPI]
6472
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "We don't care about trimmed assemblies, as we need it to work only with the known (used) ones")]
6573
public static async ValueTask<T?> ToJsonObject<T>(this Stream stream, CancellationToken cancellationToken = default) {
6674
ArgumentNullException.ThrowIfNull(stream);
6775

68-
return await JsonSerializer.DeserializeAsync<T>(stream, DefaultJsonSerialierOptions, cancellationToken).ConfigureAwait(false);
76+
return await JsonSerializer.DeserializeAsync<T>(stream, DefaultJsonSerializerOptions, cancellationToken).ConfigureAwait(false);
6977
}
7078

7179
[PublicAPI]
7280
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "We don't care about trimmed assemblies, as we need it to work only with the known (used) ones")]
7381
public static T? ToJsonObject<T>([StringSyntax(StringSyntaxAttribute.Json)] this string json) {
7482
ArgumentException.ThrowIfNullOrEmpty(json);
7583

76-
return JsonSerializer.Deserialize<T>(json, DefaultJsonSerialierOptions);
84+
return JsonSerializer.Deserialize<T>(json, DefaultJsonSerializerOptions);
7785
}
7886

7987
[PublicAPI]
8088
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "We don't care about trimmed assemblies, as we need it to work only with the known (used) ones")]
81-
public static string ToJsonText<T>(this T obj, bool writeIndented = false) => JsonSerializer.Serialize(obj, writeIndented ? IndentedJsonSerialierOptions : DefaultJsonSerialierOptions);
89+
public static string ToJsonText<T>(this T obj, bool writeIndented = false) => JsonSerializer.Serialize(obj, writeIndented ? IndentedJsonSerializerOptions : DefaultJsonSerializerOptions);
8290

8391
private static void ApplyCustomModifiers(JsonTypeInfo jsonTypeInfo) {
8492
ArgumentNullException.ThrowIfNull(jsonTypeInfo);

ArchiSteamFarm/IPC/ArchiKestrel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ private static void ConfigureServices([SuppressMessage("ReSharper", "SuggestBase
356356
}
357357

358358
services.ConfigureHttpJsonOptions(static options => {
359-
JsonSerializerOptions jsonSerializerOptions = Debugging.IsUserDebugging ? JsonUtilities.IndentedJsonSerialierOptions : JsonUtilities.DefaultJsonSerialierOptions;
359+
JsonSerializerOptions jsonSerializerOptions = Debugging.IsUserDebugging ? JsonUtilities.IndentedJsonSerializerOptions : JsonUtilities.DefaultJsonSerializerOptions;
360360

361361
options.SerializerOptions.PropertyNamingPolicy = jsonSerializerOptions.PropertyNamingPolicy;
362362
options.SerializerOptions.TypeInfoResolver = jsonSerializerOptions.TypeInfoResolver;
@@ -381,7 +381,7 @@ private static void ConfigureServices([SuppressMessage("ReSharper", "SuggestBase
381381

382382
// Modify default JSON options
383383
mvc.AddJsonOptions(static options => {
384-
JsonSerializerOptions jsonSerializerOptions = Debugging.IsUserDebugging ? JsonUtilities.IndentedJsonSerialierOptions : JsonUtilities.DefaultJsonSerialierOptions;
384+
JsonSerializerOptions jsonSerializerOptions = Debugging.IsUserDebugging ? JsonUtilities.IndentedJsonSerializerOptions : JsonUtilities.DefaultJsonSerializerOptions;
385385

386386
options.JsonSerializerOptions.PropertyNamingPolicy = jsonSerializerOptions.PropertyNamingPolicy;
387387
options.JsonSerializerOptions.TypeInfoResolver = jsonSerializerOptions.TypeInfoResolver;

ArchiSteamFarm/Web/WebBrowser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ public HttpClient GenerateDisposableHttpClient(bool extendedTimeout = false) {
753753

754754
break;
755755
default:
756-
requestMessage.Content = JsonContent.Create(data, options: JsonUtilities.DefaultJsonSerialierOptions);
756+
requestMessage.Content = JsonContent.Create(data, options: JsonUtilities.DefaultJsonSerializerOptions);
757757

758758
break;
759759
}

0 commit comments

Comments
 (0)