Changes from FlurlClient to IFlurlClient and minor code style updates.

Author: matteobortolazzo

src/CouchDB.Driver/CouchClient.cs

@@ -23,7 +23,7 @@ public partial class CouchClient : IDisposable
         private DateTime? _cookieCreationDate;
         private string _cookieToken;
         private readonly CouchSettings _settings;
-        private readonly FlurlClient _flurlClient;
+        private readonly IFlurlClient _flurlClient;
         private readonly string[] _systemDatabases = new[] { "_users", "_replicator", "_global_changes" };
         public string ConnectionString { get; private set; }
 
@@ -44,9 +44,7 @@ public CouchClient(string connectionString, Action<CouchSettings> couchSettingsF
             couchSettingsFunc?.Invoke(_settings);
 
             ConnectionString = connectionString;
-            _flurlClient = new FlurlClient(connectionString);
-
-            _flurlClient.Configure(s =>
+            _flurlClient = new FlurlClient(connectionString).Configure(s =>
             {
                 s.BeforeCall = OnBeforeCall;
                 if (_settings.ServerCertificateCustomValidationCallback != null)

src/CouchDB.Driver/CouchDatabase.cs

@@ -22,7 +22,7 @@ namespace CouchDB.Driver
     public class CouchDatabase<TSource> where TSource : CouchDocument
     {
         private readonly QueryProvider _queryProvider;
-        private readonly FlurlClient _flurlClient;
+        private readonly IFlurlClient _flurlClient;
         private readonly CouchSettings _settings;
         private readonly string _connectionString;
 
@@ -36,7 +36,7 @@ public class CouchDatabase<TSource> where TSource : CouchDocument
         /// </summary>
         public CouchSecurity Security { get; }
 
-        internal CouchDatabase(FlurlClient flurlClient, CouchSettings settings, string connectionString, string db)
+        internal CouchDatabase(IFlurlClient flurlClient, CouchSettings settings, string connectionString, string db)
         {
             _flurlClient = flurlClient ?? throw new ArgumentNullException(nameof(flurlClient));
             _settings = settings ?? throw new ArgumentNullException(nameof(settings));
@@ -262,12 +262,12 @@ public Task<List<TSource>> QueryAsync(object mangoQuery)
 
         private async Task<List<TSource>> SendQueryAsync(Func<IFlurlRequest, Task<HttpResponseMessage>> requestFunc)
         {
-            var request = NewRequest()
+            IFlurlRequest request = NewRequest()
                 .AppendPathSegment("_find");
 
-            var message = requestFunc(request);
+            Task<HttpResponseMessage> message = requestFunc(request);
 
-            var findResult = await message
+            FindResult<TSource> findResult = await message
                 .ReceiveJson<FindResult<TSource>>()
                 .SendRequestAsync()
                 .ConfigureAwait(false);
@@ -281,7 +281,7 @@ private async Task<List<TSource>> SendQueryAsync(Func<IFlurlRequest, Task<HttpRe
         /// <returns></returns>
         public async Task<List<TSource>> FindManyAsync(IEnumerable<string> docIds)
         {
-            var bulkGetResult = await NewRequest()
+            BulkGetResult<TSource> bulkGetResult = await NewRequest()
                 .AppendPathSegment("_bulk_get")
                 .PostJsonAsync(new
                 {

src/CouchDB.Driver/CouchQueryProvider.cs

@@ -12,12 +12,12 @@ namespace CouchDB.Driver
 {
     internal class CouchQueryProvider : QueryProvider
     {
-        private readonly FlurlClient _flurlClient;
+        private readonly IFlurlClient _flurlClient;
         private readonly CouchSettings _settings;
         private readonly string _connectionString;
         private readonly string _db;
 
-        public CouchQueryProvider(FlurlClient flurlClient, CouchSettings settings, string connectionString, string db)
+        public CouchQueryProvider(IFlurlClient flurlClient, CouchSettings settings, string connectionString, string db)
         {
             _flurlClient = flurlClient ?? throw new ArgumentNullException(nameof(flurlClient));
             _settings = settings ?? throw new ArgumentNullException(nameof(settings));
@@ -33,7 +33,7 @@ public override string GetQueryText(Expression expression)
         public override object Execute(Expression e, bool completeResponse)
         {
             var body = Translate(e);
-            var elementType = TypeSystem.GetElementType(e.Type);
+            Type elementType = TypeSystem.GetElementType(e.Type);
 
             MethodInfo method = typeof(CouchQueryProvider).GetMethod("GetCouchList");
             MethodInfo generic = method.MakeGenericMethod(elementType);
@@ -48,7 +48,7 @@ private string Translate(Expression expression)
 
         public CouchList<T> GetCouchList<T>(string body)
         {
-            var result = _flurlClient
+            FindResult<T> result = _flurlClient
                 .Request(_connectionString)
                 .AppendPathSegments(_db, "_find")
                 .WithHeader("Content-Type", "application/json")