From 8a8407d86e28f75c3679eed10e4e88b9dd308dff Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Thu, 17 Oct 2024 10:10:00 +0200 Subject: [PATCH] rename MessageSerializer to ApiMessageSerializer --- Pilz.Net/Api/ApiClient.cs | 8 ++++---- ...lerAttribute.cs => ApiMessageHandlerAttribute.cs} | 2 +- Pilz.Net/Api/ApiServer.cs | 12 ++++++------ ...eSerializer.cs => DefaultApiMessageSerializer.cs} | 2 +- Pilz.Net/Api/IApiClient.cs | 6 +++--- ...MessageSerializer.cs => IApiMessageSerializer.cs} | 2 +- Pilz.Net/Api/IApiServer.cs | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) rename Pilz.Net/Api/{MessageHandlerAttribute.cs => ApiMessageHandlerAttribute.cs} (75%) rename Pilz.Net/Api/{DefaultMessageSerializer.cs => DefaultApiMessageSerializer.cs} (92%) rename Pilz.Net/Api/{IMessageSerializer.cs => IApiMessageSerializer.cs} (76%) diff --git a/Pilz.Net/Api/ApiClient.cs b/Pilz.Net/Api/ApiClient.cs index 67fcb93..de6b56b 100644 --- a/Pilz.Net/Api/ApiClient.cs +++ b/Pilz.Net/Api/ApiClient.cs @@ -10,7 +10,7 @@ public class ApiClient(string apiUrl) : IApiClient public string? AuthKey { get; set; } - public virtual IMessageSerializer Serializer { get; set; } = new DefaultMessageSerializer(); + public virtual IApiMessageSerializer Serializer { get; set; } = new DefaultApiMessageSerializer(); public ILogger Log { get; set; } = NullLogger.Instance; @@ -24,7 +24,7 @@ public class ApiClient(string apiUrl) : IApiClient return SendRequest(route, message, null); } - public virtual async Task SendRequest(string route, ApiMessage? message, IMessageSerializer? serializer) + public virtual async Task SendRequest(string route, ApiMessage? message, IApiMessageSerializer? serializer) { serializer ??= Serializer; @@ -45,7 +45,7 @@ public class ApiClient(string apiUrl) : IApiClient return SendRequest(route, message, null); } - public virtual async Task> SendRequest(string route, ApiMessage? message, IMessageSerializer? serializer) where TResponse : ApiMessage + public virtual async Task> SendRequest(string route, ApiMessage? message, IApiMessageSerializer? serializer) where TResponse : ApiMessage { serializer ??= Serializer; @@ -60,7 +60,7 @@ public class ApiClient(string apiUrl) : IApiClient return new(res.StatusCode, result); } - protected virtual async Task Send(string route, ApiMessage? message, IMessageSerializer serializer) + protected virtual async Task Send(string route, ApiMessage? message, IApiMessageSerializer serializer) { var url = ApiUrl + route; HttpContent content; diff --git a/Pilz.Net/Api/MessageHandlerAttribute.cs b/Pilz.Net/Api/ApiMessageHandlerAttribute.cs similarity index 75% rename from Pilz.Net/Api/MessageHandlerAttribute.cs rename to Pilz.Net/Api/ApiMessageHandlerAttribute.cs index 9423f68..3bff5e8 100644 --- a/Pilz.Net/Api/MessageHandlerAttribute.cs +++ b/Pilz.Net/Api/ApiMessageHandlerAttribute.cs @@ -1,7 +1,7 @@ namespace Pilz.Net.Api; [AttributeUsage(AttributeTargets.Method)] -public class MessageHandlerAttribute(string route) : Attribute +public class ApiMessageHandlerAttribute(string route) : Attribute { public string Route { get; set; } = route; public Type? Serializer { get; set; } diff --git a/Pilz.Net/Api/ApiServer.cs b/Pilz.Net/Api/ApiServer.cs index 3af9c5d..a89856e 100644 --- a/Pilz.Net/Api/ApiServer.cs +++ b/Pilz.Net/Api/ApiServer.cs @@ -9,7 +9,7 @@ namespace Pilz.Net.Api; public class ApiServer(string apiUrl) : IApiServer { protected readonly Dictionary handlers = []; - protected readonly Dictionary serializers = []; + protected readonly Dictionary serializers = []; protected readonly HttpListener httpListener = new(); public event OnCheckAuthenticationEventHandler? OnCheckAuthentication; @@ -20,7 +20,7 @@ public class ApiServer(string apiUrl) : IApiServer public virtual bool EnableAuth { get; set; } - public IMessageSerializer Serializer { get; set; } = new DefaultMessageSerializer(); + public IApiMessageSerializer Serializer { get; set; } = new DefaultApiMessageSerializer(); public ILogger Log { get; set; } = NullLogger.Instance; @@ -58,7 +58,7 @@ public class ApiServer(string apiUrl) : IApiServer var method = handler.Method; // Sanity checks - if (method.GetCustomAttribute() is not MessageHandlerAttribute attribute + if (method.GetCustomAttribute() is not ApiMessageHandlerAttribute attribute || !method.ReturnType.IsAssignableTo(typeof(ApiResult))) { if (throwOnError) @@ -155,7 +155,7 @@ public class ApiServer(string apiUrl) : IApiServer // Get handler Log.Debug("Find handler"); if (!handlers.TryGetValue(url, out var handler) - || handler.Method.GetCustomAttribute() is not MessageHandlerAttribute attribute) + || handler.Method.GetCustomAttribute() is not ApiMessageHandlerAttribute attribute) return null; // Check authentication @@ -220,13 +220,13 @@ public class ApiServer(string apiUrl) : IApiServer return [.. objs]; } - protected virtual IMessageSerializer GetSerializer(Type? t) + protected virtual IApiMessageSerializer GetSerializer(Type? t) { if (t is not null) { if (serializers.TryGetValue(t, out var s) && s is not null) return s; - else if (Activator.CreateInstance(t) is IMessageSerializer ss) + else if (Activator.CreateInstance(t) is IApiMessageSerializer ss) { serializers.Add(t, ss); return ss; diff --git a/Pilz.Net/Api/DefaultMessageSerializer.cs b/Pilz.Net/Api/DefaultApiMessageSerializer.cs similarity index 92% rename from Pilz.Net/Api/DefaultMessageSerializer.cs rename to Pilz.Net/Api/DefaultApiMessageSerializer.cs index 27c67c6..faedd66 100644 --- a/Pilz.Net/Api/DefaultMessageSerializer.cs +++ b/Pilz.Net/Api/DefaultApiMessageSerializer.cs @@ -2,7 +2,7 @@ namespace Pilz.Net.Api; -public class DefaultMessageSerializer : IMessageSerializer +public class DefaultApiMessageSerializer : IApiMessageSerializer { private static JsonSerializerSettings? defaultSerializerSettings; diff --git a/Pilz.Net/Api/IApiClient.cs b/Pilz.Net/Api/IApiClient.cs index 8dc4677..4708913 100644 --- a/Pilz.Net/Api/IApiClient.cs +++ b/Pilz.Net/Api/IApiClient.cs @@ -8,7 +8,7 @@ public interface IApiClient string? AuthKey { get; set; } - IMessageSerializer Serializer { get; } + IApiMessageSerializer Serializer { get; } ILogger Log { get; set; } @@ -16,11 +16,11 @@ public interface IApiClient Task SendRequest(string route, ApiMessage? message); - Task SendRequest(string route, ApiMessage? message, IMessageSerializer? serializer); + Task SendRequest(string route, ApiMessage? message, IApiMessageSerializer? serializer); Task> SendRequest(string route) where TResponse : ApiMessage; Task> SendRequest(string route, ApiMessage? message) where TResponse : ApiMessage; - Task> SendRequest(string route, ApiMessage? message, IMessageSerializer? serializer) where TResponse : ApiMessage; + Task> SendRequest(string route, ApiMessage? message, IApiMessageSerializer? serializer) where TResponse : ApiMessage; } diff --git a/Pilz.Net/Api/IMessageSerializer.cs b/Pilz.Net/Api/IApiMessageSerializer.cs similarity index 76% rename from Pilz.Net/Api/IMessageSerializer.cs rename to Pilz.Net/Api/IApiMessageSerializer.cs index ac3679a..9d14d9e 100644 --- a/Pilz.Net/Api/IMessageSerializer.cs +++ b/Pilz.Net/Api/IApiMessageSerializer.cs @@ -1,6 +1,6 @@ namespace Pilz.Net.Api; -public interface IMessageSerializer +public interface IApiMessageSerializer { string? Serialize(ApiMessage message); ApiMessage? Deserialize(string json, Type target); diff --git a/Pilz.Net/Api/IApiServer.cs b/Pilz.Net/Api/IApiServer.cs index 3afc099..d24fdd3 100644 --- a/Pilz.Net/Api/IApiServer.cs +++ b/Pilz.Net/Api/IApiServer.cs @@ -12,7 +12,7 @@ public interface IApiServer bool EnableAuth { get; set; } - IMessageSerializer Serializer { get; } + IApiMessageSerializer Serializer { get; } ILogger Log { get; set; }