From f8c997df9c3f611a8261b12de97484fda3a8c771 Mon Sep 17 00:00:00 2001
From: Kwaku Boamah <dotfelixb@gmail.com>
Date: Tue, 12 Mar 2024 11:32:51 +0000
Subject: [PATCH] clean up

---
 src/NQuery.Core/Interfaces/INQuery.cs | 12 ++++++------
 src/NQuery.Core/NQuery.cs             | 26 +++++++++++++-------------
 src/NQuery.Test/AspNetQueryTest.cs    |  6 ++----
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/NQuery.Core/Interfaces/INQuery.cs b/src/NQuery.Core/Interfaces/INQuery.cs
index d686465..bca12a5 100644
--- a/src/NQuery.Core/Interfaces/INQuery.cs
+++ b/src/NQuery.Core/Interfaces/INQuery.cs
@@ -2,15 +2,15 @@ namespace NQuery.Core.Interfaces;
 
 public interface INQuery
 {
-    Task<TOutput?> QueryAsync<TOutput>(
+    Task<T?> QueryAsync<T>(
         string key, 
-        Func<Task<TOutput?>> query);
+        Func<Task<T?>> query);
 
-    Task<IEnumerable<TOutput>> QueryAsync<TOutput>(
+    Task<IEnumerable<T>> QueryAsync<T>(
         string key, 
-        Func<Task<IEnumerable<TOutput>>> query);
+        Func<Task<IEnumerable<T>>> query);
 
-    Task<TOutput?> MutationAsync<TOutput>(
+    Task<T?> MutationAsync<T>(
         string key,
-        Func<Task<TOutput?>> mutate);
+        Func<Task<T?>> mutate);
 }
\ No newline at end of file
diff --git a/src/NQuery.Core/NQuery.cs b/src/NQuery.Core/NQuery.cs
index 9378297..c6d4a58 100644
--- a/src/NQuery.Core/NQuery.cs
+++ b/src/NQuery.Core/NQuery.cs
@@ -60,33 +60,33 @@ public static NQuery Create(NQueryConfiguration configuration)
         return new NQuery(configuration, ConnectionMultiplexer.Connect(stackExchangeRedisConfig));
     }
 
-    public async Task<TOutput?> QueryAsync<TOutput>(string key, Func<Task<TOutput?>> query)
+    public async Task<T?> QueryAsync<T>(string key, Func<Task<T?>> query)
     {
         return _configuration.UseInMemory
             ? await InMemoryQuery(key, query)
             : await ExternalQuery(key, query);
     }
 
-    public async Task<IEnumerable<TOutput>> QueryAsync<TOutput>(string key, Func<Task<IEnumerable<TOutput>>> query)
+    public async Task<IEnumerable<T>> QueryAsync<T>(string key, Func<Task<IEnumerable<T>>> query)
     {
         return _configuration.UseInMemory
             ? await InMemoryQuery(key, query)
             : await ExternalQuery(key, query);
     }
 
-    public async Task<TOutput?> MutationAsync<TOutput>(string key, Func<Task<TOutput?>> mutate)
+    public async Task<T?> MutationAsync<T>(string key, Func<Task<T?>> mutate)
     {
         return _configuration.UseInMemory
             ? await InMemoryMutate(key, mutate)
             : await ExternalMutate(key, mutate);
     }
 
-    private async Task<TOutput> InMemoryQuery<TOutput>(string key, Func<Task<TOutput>> query)
+    private async Task<T> InMemoryQuery<T>(string key, Func<Task<T>> query)
     {
         // check if key is already set
         if (_memoryDb.TryGetValue(key, out var value))
         {
-            return (TOutput)value;
+            return (T)value;
         }
 
         // key not set 
@@ -99,12 +99,12 @@ private async Task<TOutput> InMemoryQuery<TOutput>(string key, Func<Task<TOutput
         return rst;
     }
 
-    private async Task<IEnumerable<TOutput>> InMemoryQuery<TOutput>(string key, Func<Task<IEnumerable<TOutput>>> query)
+    private async Task<IEnumerable<T>> InMemoryQuery<T>(string key, Func<Task<IEnumerable<T>>> query)
     {
         // check if key is already set
         if (_memoryDb.TryGetValue(key, out var value))
         {
-            return (IEnumerable<TOutput>)value;
+            return (IEnumerable<T>)value;
         }
 
         // key not set 
@@ -118,7 +118,7 @@ private async Task<IEnumerable<TOutput>> InMemoryQuery<TOutput>(string key, Func
         return rstLst;
     }
 
-    private async Task<TOutput?> InMemoryMutate<TOutput>(string key, Func<Task<TOutput?>> mutate)
+    private async Task<T?> InMemoryMutate<T>(string key, Func<Task<T?>> mutate)
     {
         // check if key is already set
         if (_memoryDb.ContainsKey(key))
@@ -129,13 +129,13 @@ private async Task<IEnumerable<TOutput>> InMemoryQuery<TOutput>(string key, Func
         return await mutate();
     }
 
-    private async Task<TOutput?> ExternalQuery<TOutput>(string key, Func<Task<TOutput>> query)
+    private async Task<T?> ExternalQuery<T>(string key, Func<Task<T>> query)
     {
         // check if key is already set
         var exist = await _redisDb.StringGetAsync(new RedisKey(key));
         if (!exist.IsNull)
         {
-            return JsonSerializer.Deserialize<TOutput>(exist!);
+            return JsonSerializer.Deserialize<T>(exist!);
         }
 
         // key not set 
@@ -149,13 +149,13 @@ await _redisDb.StringSetAsync(
         return rst;
     }
 
-    private async Task<IEnumerable<TOutput>> ExternalQuery<TOutput>(string key, Func<Task<IEnumerable<TOutput>>> query)
+    private async Task<IEnumerable<T>> ExternalQuery<T>(string key, Func<Task<IEnumerable<T>>> query)
     {
         // check if key is already set
         var exist = await _redisDb.StringGetAsync(new RedisKey(key));
         if (!exist.IsNull)
         {
-            return JsonSerializer.Deserialize<IEnumerable<TOutput>>(exist);
+            return JsonSerializer.Deserialize<IEnumerable<T>>(exist);
         }
 
         // key not set 
@@ -170,7 +170,7 @@ await _redisDb.StringSetAsync(
         return rstLst;
     }
 
-    private async Task<TOutput?> ExternalMutate<TOutput>(string key, Func<Task<TOutput?>> mutate)
+    private async Task<T?> ExternalMutate<T>(string key, Func<Task<T?>> mutate)
     {
         // check if key is already set
         var exist = await _redisDb.StringGetAsync(new RedisKey(key));
diff --git a/src/NQuery.Test/AspNetQueryTest.cs b/src/NQuery.Test/AspNetQueryTest.cs
index 854edd2..1d7bbb4 100644
--- a/src/NQuery.Test/AspNetQueryTest.cs
+++ b/src/NQuery.Test/AspNetQueryTest.cs
@@ -7,7 +7,7 @@ namespace NQuery.Test;
 
 public class AspNetQueryTest
 {
-    readonly ServiceCollection _services = new ServiceCollection();
+    private readonly ServiceCollection _services = new ServiceCollection();
     
     [SetUp]
     public void Setup()
@@ -17,9 +17,7 @@ public void Setup()
             cfg.UseRedis(opts =>
             {
                 opts.Endpoints.Add(new RedisEndpoint() { Host = "127.0.0.1", Port = 6379 });
-                opts.AbortOnConnectFail = false;
-                opts.ResolveDns = true;
-                opts.UseSsl = false;
+                opts.AbortOnConnectFail = false; 
             });
         }); 
     }