warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat: Adds JSON convertibles (#1253)

Browse source
This commit is contained in:
Kamron Batman 2022-11-15 18:19:05 -08:00 • committed by GitHub
parent ff79d3db40
commit 0abf72ed2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 108 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Projects/Server/Json/Converters/JsonDtoConverter.cs Normal file
View file

@ -0,0 +1,46 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: JsonDtoConverter.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
using System;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace Server.Json;
public class JsonDtoConverter<TDto, TObject> : JsonConverter<TObject>
where TDto : IJsonRootDtoConvertible<TDto, TObject>, new() where TObject : new()
{
public override TObject Read(
ref Utf8JsonReader reader,
Type typeToConvert,
JsonSerializerOptions options
)
{
if (typeof(TObject) != typeToConvert)
{
throw new JsonException($"Invalid object type to deserialize for '{typeof(TObject).Name}'");
}
// Deserialize to the DTO
var dto = JsonSerializer.Deserialize<TDto>(ref reader, options);
return TDto.ToObject(dto);
}
public override void Write(Utf8JsonWriter writer, TObject value, JsonSerializerOptions options)
{
JsonSerializer.Serialize(writer, TDto.FromObject(value), options);
}
}

29
Projects/Server/Json/Converters/JsonDtoConverterFactory.cs Normal file
View file

@ -0,0 +1,29 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: JsonDtoConverter.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
using System;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace Server.Json;
public class JsonDtoConverterFactory<TDto, TObject> : JsonConverterFactory
where TDto : IJsonRootDtoConvertible<TDto, TObject>, new() where TObject : new()
{
public override bool CanConvert(Type typeToConvert) => typeToConvert == typeof(TObject);
public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options) =>
new JsonDtoConverter<TDto, TObject>();
}

3
Projects/Server/Json/Converters/Point2DConverter.cs
View file

@ -95,9 +95,10 @@ public class Point2DConverter : JsonConverter<Point2D>
public override Point2D Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
reader.TokenType switch
{
JsonTokenType.String => Point2D.Parse(reader.GetString(), null),
JsonTokenType.StartArray => DeserializeArray(ref reader),
JsonTokenType.StartObject => DeserializeObj(ref reader),
_ => throw new JsonException("Invalid Json for Point3D")
_ => throw new JsonException("Invalid json for Point3D")
};
public override void Write(Utf8JsonWriter writer, Point2D value, JsonSerializerOptions options)

1
Projects/Server/Json/Converters/Point3DConverter.cs
View file

@ -96,6 +96,7 @@ public class Point3DConverter : JsonConverter<Point3D>
public override Point3D Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
reader.TokenType switch
{
JsonTokenType.String => Point3D.Parse(reader.GetString(), null),
JsonTokenType.StartArray => DeserializeArray(ref reader),
JsonTokenType.StartObject => DeserializeObj(ref reader),
_ => throw new JsonException("Invalid Json for Point3D")

1
Projects/Server/Json/Converters/Rectangle3DConverter.cs
View file

@ -164,6 +164,7 @@ public class Rectangle3DConverter : JsonConverter<Rectangle3D>
public override Rectangle3D Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
reader.TokenType switch
{
JsonTokenType.String => Rectangle3D.Parse(reader.GetString(), null),
JsonTokenType.StartArray => DeserializeArray(ref reader),
JsonTokenType.StartObject => DeserializeObj(ref reader, options),
_ => throw new JsonException("Invalid Json for Point3D")

1
Projects/Server/Json/Converters/WorldLocationConverter.cs
View file

@ -171,6 +171,7 @@ public class WorldLocationConverter : JsonConverter<WorldLocation>
public override WorldLocation Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
reader.TokenType switch
{
JsonTokenType.String => WorldLocation.Parse(reader.GetString(), null),
JsonTokenType.StartArray => DeserializeArray(ref reader),
JsonTokenType.StartObject => DeserializeObj(ref reader, options),
_ => throw new JsonException("Invalid Json for Point3D")

28
Projects/Server/Json/IJsonConvertible.cs Normal file
View file

@ -0,0 +1,28 @@
/*************************************************************************
* ModernUO *
* Copyright 2019-2022 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: IJsonConvertible.cs *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
namespace Server.Json;
public interface IJsonRootDtoConvertible<TSelf, TObject> where TSelf : IJsonRootDtoConvertible<TSelf, TObject> where TObject : new()
{
public abstract static TSelf FromObject(TObject obj);
public abstract static TObject ToObject(TSelf obj);
}
public interface IJsonDtoConvertible<TSelf, TObject> where TSelf : IJsonDtoConvertible<TSelf, TObject> where TObject : new()
{
public abstract TSelf HydrateDto(TObject obj);
public abstract TObject HydrateObject(TObject obj);
}