diff --git a/Casbin/Extensions/LoggerExtension.cs b/Casbin/Extensions/LoggerExtension.cs index b0124a7..5d8b763 100644 --- a/Casbin/Extensions/LoggerExtension.cs +++ b/Casbin/Extensions/LoggerExtension.cs @@ -11,20 +11,20 @@ public static class LoggerExtension public static void LogEnforceCachedResult(this ILogger logger, in TRequest requestValues, bool result) where TRequest : IRequestValues { - logger.LogInformation("Request: {1} ---> {0} (cached)", result, requestValues); + logger.LogInformation("Request: {Result} ---> {RequestValues} (cached)", result, requestValues); } public static void LogEnforceResult(this ILogger logger, in TRequest requestValues, bool result) where TRequest : IRequestValues { - logger.LogInformation("Request: {1} ---> {0}", result, requestValues); + logger.LogInformation("Request: {Result} ---> {RequestValues}", result, requestValues); } public static void LogEnforceResult(this ILogger logger, in TRequest requestValues, bool result, IEnumerable> explains) where TRequest : IRequestValues { - logger.LogInformation("Request: {1} ---> {0}\nHit Store: {2}", result, requestValues, + logger.LogInformation("Request: {Result} ---> {RequestValues} Hit Store: {Explain}", result, requestValues, string.Join("\n", explains.Select(explain => string.Join(", ", explain)))); } diff --git a/Casbin/Model/RequestValues.cs b/Casbin/Model/RequestValues.cs index 9eebfb6..8d2e488 100644 --- a/Casbin/Model/RequestValues.cs +++ b/Casbin/Model/RequestValues.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Text; namespace Casbin.Model; @@ -46,6 +47,11 @@ public bool TrySetValue(int index, T1 value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}]"; + } } public struct RequestValues : IRequestValues @@ -82,6 +88,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}]"; + } } public struct RequestValues : IRequestValues @@ -124,6 +135,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}]"; + } } public struct RequestValues : IRequestValues @@ -172,6 +188,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}]"; + } } public struct RequestValues : IRequestValues @@ -226,6 +247,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}, {RequestValues.ToStringValue(Value5)}]"; + } } public struct RequestValues : IRequestValues @@ -286,6 +312,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}, {RequestValues.ToStringValue(Value5)}, {RequestValues.ToStringValue(Value6)}]"; + } } public struct RequestValues : IRequestValues @@ -352,6 +383,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}, {RequestValues.ToStringValue(Value5)}, {RequestValues.ToStringValue(Value6)}, {RequestValues.ToStringValue(Value7)}]"; + } } public struct RequestValues : IRequestValues @@ -424,6 +460,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}, {RequestValues.ToStringValue(Value5)}, {RequestValues.ToStringValue(Value6)}, {RequestValues.ToStringValue(Value7)}, {RequestValues.ToStringValue(Value8)}]"; + } } public struct RequestValues : IRequestValues @@ -503,6 +544,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}, {RequestValues.ToStringValue(Value5)}, {RequestValues.ToStringValue(Value6)}, {RequestValues.ToStringValue(Value7)}, {RequestValues.ToStringValue(Value8)}, {RequestValues.ToStringValue(Value9)}]"; + } } public struct RequestValues : IRequestValues @@ -588,6 +634,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}, {RequestValues.ToStringValue(Value5)}, {RequestValues.ToStringValue(Value6)}, {RequestValues.ToStringValue(Value7)}, {RequestValues.ToStringValue(Value8)}, {RequestValues.ToStringValue(Value9)}, {RequestValues.ToStringValue(Value10)}]"; + } } public struct RequestValues : IRequestValues @@ -679,6 +730,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}, {RequestValues.ToStringValue(Value5)}, {RequestValues.ToStringValue(Value6)}, {RequestValues.ToStringValue(Value7)}, {RequestValues.ToStringValue(Value8)}, {RequestValues.ToStringValue(Value9)}, {RequestValues.ToStringValue(Value10)}, {RequestValues.ToStringValue(Value11)}]"; + } } public struct RequestValues : IRequestValues @@ -776,6 +832,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}, {RequestValues.ToStringValue(Value5)}, {RequestValues.ToStringValue(Value6)}, {RequestValues.ToStringValue(Value7)}, {RequestValues.ToStringValue(Value8)}, {RequestValues.ToStringValue(Value9)}, {RequestValues.ToStringValue(Value10)}, {RequestValues.ToStringValue(Value11)}, {RequestValues.ToStringValue(Value12)}]"; + } } public struct RequestValues : IRequestValues @@ -879,6 +940,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}, {RequestValues.ToStringValue(Value5)}, {RequestValues.ToStringValue(Value6)}, {RequestValues.ToStringValue(Value7)}, {RequestValues.ToStringValue(Value8)}, {RequestValues.ToStringValue(Value9)}, {RequestValues.ToStringValue(Value10)}, {RequestValues.ToStringValue(Value11)}, {RequestValues.ToStringValue(Value12)}, {RequestValues.ToStringValue(Value13)}]"; + } } public struct RequestValues : IRequestValues @@ -988,6 +1054,11 @@ public bool TrySetValue(int index, T value) return false; } } + + public override string ToString() + { + return $"[{RequestValues.ToStringValue(Value1)}, {RequestValues.ToStringValue(Value2)}, {RequestValues.ToStringValue(Value3)}, {RequestValues.ToStringValue(Value4)}, {RequestValues.ToStringValue(Value5)}, {RequestValues.ToStringValue(Value6)}, {RequestValues.ToStringValue(Value7)}, {RequestValues.ToStringValue(Value8)}, {RequestValues.ToStringValue(Value9)}, {RequestValues.ToStringValue(Value10)}, {RequestValues.ToStringValue(Value11)}, {RequestValues.ToStringValue(Value12)}, {RequestValues.ToStringValue(Value13)}, {RequestValues.ToStringValue(Value14)}]"; + } } public struct StringRequestValues : IRequestValues @@ -1110,6 +1181,11 @@ public bool TrySetValue(int index, string value) return false; } } + + public override string ToString() + { + return $"[{Value1}, {Value2}, {Value3}, {Value4}, {Value5}, {Value6}, {Value7}, {Value8}, {Value9}, {Value10}, {Value11}, {Value12}, {Value13}, {Value14}]"; + } } public readonly struct ListRequestValues : IRequestValues @@ -1152,4 +1228,20 @@ public bool TrySetValue(int index, T value) _values[index] = v; return true; } + + public override string ToString() + { + var sb = new StringBuilder(); + sb.Append('['); + for (var i = 0; i < _values.Count; i++) + { + if (i > 0) + { + sb.Append(", "); + } + sb.Append(RequestValues.ToStringValue(_values[i])); + } + sb.Append(']'); + return sb.ToString(); + } }