Use ValueTasks instead of Tasks

Core.Arango.Tests/LinqTest_BasicOperations.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Core.Arango.Protocol;
@@ -46,14 +44,9 @@ class InnerChain
         public string F { get; set; }
     }
 
-    public class LinqTest_BasicOperations : TestBase
+    public class LinqTest_BasicOperations(ITestOutputHelper output) : TestBase
     {
         private const string D = "test";
-        private readonly ITestOutputHelper _output;
-        public LinqTest_BasicOperations(ITestOutputHelper output)
-        {
-            _output = output;
-        }
 
         [Fact]
         public void Any()
@@ -81,7 +74,7 @@ public async Task GroupBy()
 
             var result = await q.ToListAsync();
 
-            _output.WriteLine(q.ToAql().aql);
+            output.WriteLine(q.ToAql().aql);
         }
 
         /*[Fact]
@@ -192,7 +185,7 @@ public async Task Count_In_Filter()
             var q = Arango.Query<Activity>("test")
                 .Where(x => x.Notes.Count() == 3);
 
-            _output.WriteLine(q.ToAql().aql);
+            output.WriteLine(q.ToAql().aql);
 
             var activities = await q.ToListAsync();
 
@@ -205,7 +198,7 @@ public async Task Count_In_Select()
             var q = Arango.Query<Activity>("test")
                 .Select(x => x.Notes.Count());
 
-            _output.WriteLine(q.ToAql().aql);
+            output.WriteLine(q.ToAql().aql);
 
             var activitiesNotesCount = await q.ToListAsync();
 
@@ -227,7 +220,7 @@ public async Task Contains()
         {
             var p = await Arango.Query<Activity>("test").FirstOrDefaultAsync();
 
-            _output.WriteLine(JsonConvert.SerializeObject(p));
+            output.WriteLine(JsonConvert.SerializeObject(p));
 
             var boolean = Arango.Query<Activity>("test").Contains(p); // This should work: does `p` not get serialized the same way is it gets de-serialized? This operations should be inverse of each other.
 
@@ -283,7 +276,7 @@ public async Task Except_Compare_Keys()
                 .Select(x => x.Key)
                 .Except(list);
 
-            PrintQuery(q, _output);
+            PrintQuery(q, output);
 
             var p = await q.ToListAsync();
 
@@ -298,7 +291,7 @@ public async Task Combine_Skip_Take()
                 .Take(1)
                 .Select(x => x.Key);
 
-            PrintQuery(q, _output);
+            PrintQuery(q, output);
 
             var p = await q.ToListAsync();
 
@@ -357,8 +350,8 @@ public async Task Union()
 
             var aql = q.ToAql();
 
-            _output.WriteLine(aql.aql);
-            _output.WriteLine(JsonConvert.SerializeObject(aql.bindVars));
+            output.WriteLine(aql.aql);
+            output.WriteLine(JsonConvert.SerializeObject(aql.bindVars));
 
             var p = await q.ToListAsync();
 

Core.Arango.Tests/LinqTest_String.cs

@@ -1,26 +1,18 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Core.Arango.Protocol;
 using Core.Arango.Linq;
 using Core.Arango.Tests.Core;
-using Newtonsoft.Json;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Core.Arango.Tests
 {
-    public class LinqTest_String : TestBase
+    public class LinqTest_String(ITestOutputHelper output) : TestBase
     {
         private const string D = "test";
-        private readonly ITestOutputHelper _output;
-        public LinqTest_String(ITestOutputHelper output)
-        {
-            _output = output;
-        }
 
         [Fact]
         public async Task StringConcat()
@@ -201,8 +193,8 @@ public async Task StringSubstring()
             Assert.Equal("Project A", p1.Name);
             Assert.Equal("Project A", p2.Name);
 
-            _output.WriteLine(q1.ToAql().aql);
-            _output.WriteLine(q2.ToAql().aql);
+            output.WriteLine(q1.ToAql().aql);
+            output.WriteLine(q2.ToAql().aql);
         }
 
         [Fact]
@@ -212,7 +204,7 @@ public async Task StringToLower()
             var p = await q.FirstOrDefaultAsync();
 
             Assert.Equal("Project A", p.Name);
-            _output.WriteLine(q.ToAql().aql);
+            output.WriteLine(q.ToAql().aql);
         }
 
         [Fact]
@@ -222,7 +214,7 @@ public async Task StringToUpper()
             var p = await q.FirstOrDefaultAsync();
 
             Assert.Equal("Project A", p.Name);
-            _output.WriteLine(q.ToAql().aql);
+            output.WriteLine(q.ToAql().aql);
         }
 
         public override async Task InitializeAsync()

Core.Arango.Tests/QueryStatisticTest.cs

@@ -9,15 +9,8 @@
 
 namespace Core.Arango.Tests
 {
-    public class QueryStatisticTest : TestBase
+    public class QueryStatisticTest(ITestOutputHelper output) : TestBase
     {
-        private readonly ITestOutputHelper _output;
-
-        public QueryStatisticTest(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         public override async Task InitializeAsync()
         {
             Arango =
@@ -31,7 +24,7 @@ public override async Task InitializeAsync()
                             foreach (var p in bindVars.OrderByDescending(x => x.Key.Length))
                                 boundQuery = boundQuery.Replace("@" + p.Key, JsonConvert.SerializeObject(p.Value));
 
-                            _output.WriteLine(
+                            output.WriteLine(
                                 $"{boundQuery}\n{JsonConvert.SerializeObject(stats, Formatting.Indented)}");
                         }
                     });

Core.Arango.Tests/TransactionTest.cs

@@ -110,7 +110,7 @@ public async Task StreamTransactionQuery(string serializer)
             Assert.Equal(3, (await Arango.Query.FindAsync<Entity>("test", "test", $"true")).Count);
 
             var exception =
-                await Assert.ThrowsAsync<ArangoException>(() => Arango.Query.FindAsync<Entity>(t2, "test", $"true"));
+                await Assert.ThrowsAsync<ArangoException>(() => Arango.Query.FindAsync<Entity>(t2, "test", $"true").AsTask());
 
             Assert.NotNull(exception.ErrorNumber);
             Assert.NotNull(exception.Code);

Core.Arango/ArangoContext.cs

@@ -110,7 +110,7 @@ public ArangoContext(string cs, IArangoConfiguration settings = null)
         public IArangoPregelModule Pregel { get; }
 
         /// <inheritdoc />
-        public async Task<ArangoVersion> GetVersionAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<ArangoVersion> GetVersionAsync(CancellationToken cancellationToken = default)
         {
             var res = await Configuration.Transport.SendAsync<ArangoVersion>(HttpMethod.Get,
                 "/_db/_system/_api/version",
@@ -123,7 +123,7 @@ public async Task<ArangoVersion> GetVersionAsync(CancellationToken cancellationT
         }
 
         /// <inheritdoc />
-        public async Task<IReadOnlyCollection<string>> GetEndpointsAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<IReadOnlyCollection<string>> GetEndpointsAsync(CancellationToken cancellationToken = default)
         {
             var res = await Configuration.Transport.SendAsync<EndpointResponse>(HttpMethod.Get,
                 "/_api/cluster/endpoints", cancellationToken: cancellationToken);

Core.Arango/IArangoContext.cs

@@ -90,11 +90,11 @@ public interface IArangoContext
         /// <summary>
         ///     Get Arango server version and license
         /// </summary>
-        Task<ArangoVersion> GetVersionAsync(CancellationToken cancellationToken = default);
+        ValueTask<ArangoVersion> GetVersionAsync(CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     Get Arango cluster endpoints
         /// </summary>
-        Task<IReadOnlyCollection<string>> GetEndpointsAsync(CancellationToken cancellationToken = default);
+        ValueTask<IReadOnlyCollection<string>> GetEndpointsAsync(CancellationToken cancellationToken = default);
     }
 }

Core.Arango/Linq/ArangoQueryExtensions.cs

@@ -11,7 +11,7 @@
 
 namespace Core.Arango.Linq
 {
     public static class ArangoQueryableExtensions
     {
         /*Relinq Extentions*/
 
@@ -45,35 +45,35 @@
             return queryable;
         }
 
         public static (string aql, IDictionary<string, object> bindVars) ToAql<T>(this IQueryable<T> source)
         {
             var data = source.AsArangoQueryable().GetQueryData();
             return (data.Query.Trim(), data.BindVars);
         }
 
-        public static Task<TSource> FirstAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
+        public static ValueTask<TSource> FirstAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
         {
             return FirstOrDefaultAsync(source, false, null, cancellationToken);
         }
 
-        public static Task<TSource> FirstAsync<TSource>(this IQueryable<TSource> source,
+        public static ValueTask<TSource> FirstAsync<TSource>(this IQueryable<TSource> source,
             Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default)
         {
             return FirstOrDefaultAsync(source, false, predicate, cancellationToken);
         }
 
-        public static Task<TSource> FirstOrDefaultAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
+        public static ValueTask<TSource> FirstOrDefaultAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
         {
             return FirstOrDefaultAsync(source, true, null, cancellationToken);
         }
 
-        public static Task<TSource> FirstOrDefaultAsync<TSource>(this IQueryable<TSource> source,
+        public static ValueTask<TSource> FirstOrDefaultAsync<TSource>(this IQueryable<TSource> source,
             Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default)
         {
             return FirstOrDefaultAsync(source, true, predicate, cancellationToken);
         }
 
-        private static Task<T> FirstOrDefaultAsync<T>(this IQueryable<T> source, bool returnDefaultWhenEmpty,
+        private static ValueTask<T> FirstOrDefaultAsync<T>(this IQueryable<T> source, bool returnDefaultWhenEmpty,
             Expression<Func<T, bool>> predicate, CancellationToken cancellationToken = default)
         {
             if (predicate != null)
@@ -85,29 +85,29 @@
                 : source.AsArangoQueryable().FirstAsync(cancellationToken);
         }
 
-        public static Task<TSource> SingleAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
+        public static ValueTask<TSource> SingleAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
         {
             return SingleOrDefaultAsync(source, false, null, cancellationToken);
         }
 
-        public static Task<TSource> SingleAsync<TSource>(this IQueryable<TSource> source,
+        public static ValueTask<TSource> SingleAsync<TSource>(this IQueryable<TSource> source,
             Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default)
         {
             return SingleOrDefaultAsync(source, false, predicate, cancellationToken);
         }
 
-        public static Task<TSource> SingleOrDefaultAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
+        public static ValueTask<TSource> SingleOrDefaultAsync<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
         {
             return SingleOrDefaultAsync(source, true, null, cancellationToken);
         }
 
-        public static Task<TSource> SingleOrDefaultAsync<TSource>(this IQueryable<TSource> source,
+        public static ValueTask<TSource> SingleOrDefaultAsync<TSource>(this IQueryable<TSource> source,
             Expression<Func<TSource, bool>> predicate, CancellationToken cancellationToken = default)
         {
             return SingleOrDefaultAsync(source, true, predicate, cancellationToken);
         }
 
-        private static Task<T> SingleOrDefaultAsync<T>(this IQueryable<T> source, bool returnDefaultWhenEmpty,
+        private static ValueTask<T> SingleOrDefaultAsync<T>(this IQueryable<T> source, bool returnDefaultWhenEmpty,
             Expression<Func<T, bool>> predicate, CancellationToken cancellationToken = default)
         {
             if (predicate != null)
@@ -119,7 +119,7 @@
                 : source.AsArangoQueryable().SingleAsync(cancellationToken);
         }
 
-        public static Task<List<T>> ToListAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken = default)
+        public static ValueTask<List<T>> ToListAsync<T>(this IQueryable<T> source, CancellationToken cancellationToken = default)
         {
             return source.AsArangoQueryable().ToListAsync(cancellationToken);
         }

Core.Arango/Linq/Interface/IArangoLinq.cs

@@ -11,6 +11,6 @@ internal interface IArangoLinq
         public string ResolvePropertyName(Type t, string s);
         public string ResolveCollectionName(Type t);
         public IAsyncEnumerable<T> StreamAsync<T>(string query, IDictionary<string, object> bindVars, CancellationToken cancellationToken = default);
-        public Task<ArangoList<T>> ExecuteAsync<T>(string query, IDictionary<string, object> bindVars, CancellationToken cancellationToken = default);
+        public ValueTask<ArangoList<T>> ExecuteAsync<T>(string query, IDictionary<string, object> bindVars, CancellationToken cancellationToken = default);
     }
 }

Core.Arango/Linq/Internal/ArangoLinq.cs

@@ -34,7 +34,7 @@ public IAsyncEnumerable<T> StreamAsync<T>(string query, IDictionary<string, obje
             return _context.Query.ExecuteStreamAsync<T>(_handle, query, bindVars, cancellationToken: cancellationToken);
         }
 
-        public async Task<ArangoList<T>> ExecuteAsync<T>(string query, IDictionary<string, object> bindVars, CancellationToken cancellationToken = default)
+        public async ValueTask<ArangoList<T>> ExecuteAsync<T>(string query, IDictionary<string, object> bindVars, CancellationToken cancellationToken = default)
         {
             return await _context.Query.ExecuteAsync<T>(_handle, query, bindVars, cancellationToken: cancellationToken).ConfigureAwait(false);
         }

Core.Arango/Linq/Query/ArangoQueryable.cs

@@ -29,34 +29,34 @@ public ArangoQueryable(IQueryProvider provider, Expression expression, IArangoLi
             this.db = db;
         }
 
-        public async Task<List<T>> ToListAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<List<T>> ToListAsync(CancellationToken cancellationToken = default)
         {
             var data = GetQueryData();
             return await db.ExecuteAsync<T>(data.Query, data.BindVars, cancellationToken).ConfigureAwait(false);
         }
 
-        public async Task<T> SingleOrDefaultAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<T> SingleOrDefaultAsync(CancellationToken cancellationToken = default)
         {
             var data = GetQueryData();
             var list = await db.ExecuteAsync<T>(data.Query, data.BindVars, cancellationToken).ConfigureAwait(false);
             return list.SingleOrDefault();
         }
 
-        public async Task<T> SingleAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<T> SingleAsync(CancellationToken cancellationToken = default)
         {
             var data = GetQueryData();
             var list = await db.ExecuteAsync<T>(data.Query, data.BindVars, cancellationToken).ConfigureAwait(false);
             return list.Single();
         }
 
-        public async Task<T> FirstOrDefaultAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<T> FirstOrDefaultAsync(CancellationToken cancellationToken = default)
         {
             var data = GetQueryData();
             var list = await db.ExecuteAsync<T>(data.Query, data.BindVars, cancellationToken).ConfigureAwait(false);
             return list.FirstOrDefault();
         }
 
-        public async Task<T> FirstAsync(CancellationToken cancellationToken = default)
+        public async ValueTask<T> FirstAsync(CancellationToken cancellationToken = default)
         {
             var data = GetQueryData();
             var list = await db.ExecuteAsync<T>(data.Query, data.BindVars, cancellationToken).ConfigureAwait(false);

Core.Arango/Modules/IArangoAnalyzerModule.cs

@@ -13,7 +13,7 @@ public interface IArangoAnalyzerModule
         /// <summary>
         ///     creates a new Analyzer based on the provided definition
         /// </summary>
-        Task CreateAsync(ArangoHandle database, ArangoAnalyzer analyzer, CancellationToken cancellationToken = default);
+        ValueTask CreateAsync(ArangoHandle database, ArangoAnalyzer analyzer, CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     removes an Analyzer configuration
@@ -22,19 +22,19 @@ public interface IArangoAnalyzerModule
         /// <param name="analyzer">The name of the Analyzer to remove.</param>
         /// <param name="force">The Analyzer configuration should be removed even if it is in-use. The default value is false.</param>
         /// <param name="cancellationToken"></param>
-        Task DeleteAsync(ArangoHandle database, string analyzer, bool force = false,
+        ValueTask DeleteAsync(ArangoHandle database, string analyzer, bool force = false,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     returns a listing of available Analyzer definitions
         /// </summary>
-        Task<IReadOnlyCollection<ArangoAnalyzer>> ListAsync(ArangoHandle database,
+        ValueTask<IReadOnlyCollection<ArangoAnalyzer>> ListAsync(ArangoHandle database,
             CancellationToken cancellationToken = default);
 
         /// <summary>
         ///     returns an Analyzer definition
         /// </summary>
-        Task<ArangoAnalyzer> GetDefinitionAsync(ArangoHandle database, string analyzer,
+        ValueTask<ArangoAnalyzer> GetDefinitionAsync(ArangoHandle database, string analyzer,
             CancellationToken cancellationToken = default);
     }
 }