Fixing names and DeepCode issue

Daniel-iel · Apr 30, 2024 · 0d654ce · 0d654ce
1 parent 48b0f55
commit 0d654ce
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 22 deletions.
diff --git a/bench/Spinner.Benchmark/WebSiteInterceptor.cs b/bench/Spinner.Benchmark/WebSiteInterceptor.cs
@@ -2,7 +2,7 @@
 
 namespace Writer.Benchmark
 {
-    internal class WebSiteInterceptor : IInterceptors
+    internal class WebSiteInterceptor : IInterceptor
     {
         public object Parse(object propertyValue)
         {

diff --git a/src/Spinner.Test/Cache/InterceptorCacheTest.cs b/src/Spinner.Test/Cache/InterceptorCacheTest.cs
@@ -12,7 +12,7 @@ public void TryGet_WhenCalled_ShouldReturnInterceptorFromCache()
         {
             // Arrange
             const string key = "key";
-            IInterceptors interceptor = new CacheInterceptor();
+            IInterceptor interceptor = new CacheInterceptor();
 
             InterceptorCache.Add(key, interceptor);
             // Act

diff --git a/src/Spinner.Test/Helper/Interceptors/CacheInterceptor.cs b/src/Spinner.Test/Helper/Interceptors/CacheInterceptor.cs
@@ -2,7 +2,7 @@
 
 namespace Spinner.Test.Helper.Interceptors
 {
-    internal sealed class CacheInterceptor : IInterceptors
+    internal sealed class CacheInterceptor : IInterceptor
     {
         public object Parse(object obj)
         {

diff --git a/src/Spinner.Test/Helper/Interceptors/DecimalInterceptor.cs b/src/Spinner.Test/Helper/Interceptors/DecimalInterceptor.cs
@@ -3,7 +3,7 @@
 
 namespace Spinner.Test.Helper.Interceptors
 {
-    internal sealed class DecimalInterceptor : IInterceptors
+    internal sealed class DecimalInterceptor : IInterceptor
     {
         public object Parse(object obj)
         {

diff --git a/src/Spinner/Interceptors/IInterceptors.cs → src/Spinner/Interceptors/IInterceptor.cs b/src/Spinner/Interceptors/IInterceptors.cs → src/Spinner/Interceptors/IInterceptor.cs
@@ -1,6 +1,6 @@
 namespace Spinner.Interceptors
 {
-    public interface IInterceptors
+    public interface IInterceptor
     {
         object Parse(object obj);
     }

diff --git a/src/Spinner/Internals/Cache/InterceptorCache.cs b/src/Spinner/Internals/Cache/InterceptorCache.cs
@@ -6,21 +6,21 @@ namespace Spinner.Internals.Cache
 {
     internal static class InterceptorCache
     {
-        private static readonly Dictionary<string, IInterceptors> cache = new Dictionary<string, IInterceptors>();
+        private static readonly Dictionary<string, IInterceptor> cache = new Dictionary<string, IInterceptor>();
 
-        public static IEnumerable<IInterceptors> Interceptors
+        public static IEnumerable<IInterceptor> Interceptors
         {
             get => cache.Values.ToList();
         }
 
-        public static bool Add(string key, IInterceptors value)
+        public static bool Add(string key, IInterceptor value)
         {
             return cache.TryAdd(key, value);
         }
 
-        public static bool TryGet(string key, out IInterceptors output)
+        public static bool TryGet(string key, out IInterceptor output)
         {
-            if (cache.TryGetValue(key, out IInterceptors value))
+            if (cache.TryGetValue(key, out IInterceptor value))
             {
                 output = value;
                 return true;

diff --git a/src/Spinner/Spinner.cs b/src/Spinner/Spinner.cs
@@ -120,9 +120,9 @@ private void ReadPositionalString(ReadOnlySpan<char> text)
 
                 if (attribute.Type is not null)
                 {
-                    if (!InterceptorCache.TryGet(attribute.Type.Name, out IInterceptors interceptor))
+                    if (!InterceptorCache.TryGet(attribute.Type.Name, out IInterceptor interceptor))
                     {
-                        interceptor = (IInterceptors)Activator.CreateInstance(attribute.Type);
+                        interceptor = (IInterceptor)Activator.CreateInstance(attribute.Type);
                         InterceptorCache.Add(attribute.Type.Name, interceptor);
                     }
 
@@ -190,11 +190,9 @@ private static ReadPropertyAttribute GetReaderProperty(PropertyInfo info) =>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static Func<PropertyInfo, bool> PredicateForWriteProperty()
         {
-            return (prop) =>
-            {
-                return prop.GetCustomAttributes(typeof(WritePropertyAttribute), false)
-                    .All(attribute => attribute is WritePropertyAttribute);
-            };
+            return (prop) => prop
+                .GetCustomAttributes(typeof(WritePropertyAttribute), false)
+                .All(attribute => attribute is WritePropertyAttribute);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -208,11 +206,9 @@ private static Func<PropertyInfo, ushort> PredicateForOrderByWriteProperty()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private static Func<PropertyInfo, bool> PredicateForReadProperty()
         {
-            return (prop) =>
-            {
-                return prop.GetCustomAttributes(typeof(ReadPropertyAttribute), false)
-                    .All(attribute => attribute is ReadPropertyAttribute);
-            };
+            return (prop) => prop
+                .GetCustomAttributes(typeof(ReadPropertyAttribute), false)
+                .All(attribute => attribute is ReadPropertyAttribute);
         }
     }
 }