Code cleanup, projection fixes (#16)

Co-authored-by: jeffrey-elliott <[email protected]>
Co-authored-by: Steve Hewitt <[email protected]>

Author: a-random-steve

src/DataStax.AstraDB.DataApi/Admin/AstraDatabasesAdmin.cs

@@ -20,7 +20,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -73,10 +72,9 @@ public List<string> ListDatabaseNames()
     /// var names = await admin.ListDatabaseNamesAsync();
     /// </code>
     /// </example>
-    public async Task<List<string>> ListDatabaseNamesAsync()
+    public Task<List<string>> ListDatabaseNamesAsync()
     {
-        var databases = await ListDatabasesAsync().ConfigureAwait(false);
-        return databases.Select(db => db.Info.Name).ToList();
+        return ListDatabaseNamesAsync(null);
     }
 
     /// <summary>
@@ -208,7 +206,7 @@ public bool DoesDatabaseExist(string databaseName)
     public async Task<bool> DoesDatabaseExistAsync(string databaseName)
     {
         Guard.NotNullOrEmpty(databaseName, nameof(databaseName));
-        List<string> list = await ListDatabaseNamesAsync();
+        List<string> list = await ListDatabaseNamesAsync().ConfigureAwait(false);
         return list.Contains(databaseName);
     }
 
@@ -244,7 +242,7 @@ public async Task<bool> DoesDatabaseExistAsync(Guid dbGuid)
     {
         Guard.NotEmpty(dbGuid, nameof(dbGuid));
         string guid = dbGuid.ToString();
-        List<DatabaseInfo> dbList = await ListDatabasesAsync();
+        List<DatabaseInfo> dbList = await ListDatabasesAsync().ConfigureAwait(false);
         return dbList.Any(item => item.Id == guid);
     }
 
@@ -671,9 +669,9 @@ public DatabaseInfo GetDatabaseInfo(Guid dbGuid)
     /// var info = await admin.GetDatabaseInfoAsync(new Guid("..."));
     /// </code>
     /// </example>
-    public async Task<DatabaseInfo> GetDatabaseInfoAsync(Guid dbGuid)
+    public Task<DatabaseInfo> GetDatabaseInfoAsync(Guid dbGuid)
     {
-        return await GetDatabaseInfoAsync(dbGuid, null, false).ConfigureAwait(false);
+        return GetDatabaseInfoAsync(dbGuid, null, true);
     }
 
     /// <summary>
@@ -703,9 +701,9 @@ public DatabaseInfo GetDatabaseInfo(Guid dbGuid, CommandOptions options)
     /// var info = await admin.GetDatabaseInfoAsync(new Guid("..."), options);
     /// </code>
     /// </example>
-    public async Task<DatabaseInfo> GetDatabaseInfoAsync(Guid dbGuid, CommandOptions options)
+    public Task<DatabaseInfo> GetDatabaseInfoAsync(Guid dbGuid, CommandOptions options)
     {
-        return await GetDatabaseInfoAsync(dbGuid, options, false).ConfigureAwait(false);
+        return GetDatabaseInfoAsync(dbGuid, options, false);
     }
 
     internal async Task<DatabaseInfo> GetDatabaseInfoAsync(Guid dbGuid, bool runSynchronously)

src/DataStax.AstraDB.DataApi/Collections/Collection.cs

@@ -274,9 +274,9 @@ public void Drop()
     /// <summary>
     /// Asynchronously drops the collection from the database.
     /// </summary>
-    public async Task DropAsync()
+    public Task DropAsync()
     {
-        await _database.DropCollectionAsync(_collectionName).ConfigureAwait(false);
+        return _database.DropCollectionAsync(_collectionName);
     }
 
     public T FindOne()
@@ -754,10 +754,9 @@ public Task<T> FindOneAndUpdateAsync(Filter<T> filter, UpdateBuilder<T> update,
 
     /// <inheritdoc cref="FindOneAndUpdateAsync(Filter{T}, UpdateBuilder{T}, FindOneAndUpdateOptions{T})"/>
     /// <param name="commandOptions"></param>
-    public async Task<T> FindOneAndUpdateAsync(Filter<T> filter, UpdateBuilder<T> update, FindOneAndUpdateOptions<T> updateOptions, CommandOptions commandOptions)
+    public Task<T> FindOneAndUpdateAsync(Filter<T> filter, UpdateBuilder<T> update, FindOneAndUpdateOptions<T> updateOptions, CommandOptions commandOptions)
     {
-        var response = await FindOneAndUpdateAsync<T>(filter, update, updateOptions, commandOptions, false).ConfigureAwait(false);
-        return response;
+        return FindOneAndUpdateAsync<T>(filter, update, updateOptions, commandOptions, false);
     }
 
     /// <summary>
@@ -807,10 +806,9 @@ public Task<TResult> FindOneAndUpdateAsync<TResult>(Filter<T> filter, UpdateBuil
 
     /// <inheritdoc cref="FindOneAndUpdateAsync{TResult}(Filter{T}, UpdateBuilder{T}, FindOneAndUpdateOptions{T})"/>
     /// <param name="commandOptions"></param>
-    public async Task<TResult> FindOneAndUpdateAsync<TResult>(Filter<T> filter, UpdateBuilder<T> update, FindOneAndUpdateOptions<T> updateOptions, CommandOptions commandOptions)
+    public Task<TResult> FindOneAndUpdateAsync<TResult>(Filter<T> filter, UpdateBuilder<T> update, FindOneAndUpdateOptions<T> updateOptions, CommandOptions commandOptions)
     {
-        var response = await FindOneAndUpdateAsync<TResult>(filter, update, updateOptions, commandOptions, false).ConfigureAwait(false);
-        return response;
+        return FindOneAndUpdateAsync<TResult>(filter, update, updateOptions, commandOptions, false);
     }
 
     internal async Task<TResult> FindOneAndUpdateAsync<TResult>(Filter<T> filter, UpdateBuilder<T> update, FindOneAndUpdateOptions<T> updateOptions, CommandOptions commandOptions, bool runSynchronously)
@@ -869,10 +867,9 @@ public Task<T> FindOneAndReplaceAsync(T replacement, ReplaceOptions<T> replaceOp
 
     /// <inheritdoc cref="FindOneAndReplaceAsync(T, ReplaceOptions{T})"/>
     /// <param name="commandOptions"></param>
-    public async Task<T> FindOneAndReplaceAsync(T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
+    public Task<T> FindOneAndReplaceAsync(T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
     {
-        var response = await FindOneAndReplaceAsync<T>(null, replacement, replaceOptions, commandOptions, false).ConfigureAwait(false);
-        return response;
+        return FindOneAndReplaceAsync<T>(null, replacement, replaceOptions, commandOptions, false);
     }
 
     /// <summary>
@@ -922,10 +919,9 @@ public Task<TResult> FindOneAndReplaceAsync<TResult>(T replacement, ReplaceOptio
 
     /// <inheritdoc cref="FindOneAndReplaceAsync{TResult}(T, ReplaceOptions{T})"/>
     /// <param name="commandOptions"></param>
-    public async Task<TResult> FindOneAndReplaceAsync<TResult>(T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
+    public Task<TResult> FindOneAndReplaceAsync<TResult>(T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
     {
-        var response = await FindOneAndReplaceAsync<TResult>(null, replacement, replaceOptions, commandOptions, false).ConfigureAwait(false);
-        return response;
+        return FindOneAndReplaceAsync<TResult>(null, replacement, replaceOptions, commandOptions, false);
     }
 
     /// <summary>
@@ -976,10 +972,9 @@ public Task<T> FindOneAndReplaceAsync(Filter<T> filter, T replacement, ReplaceOp
 
     /// <inheritdoc cref="FindOneAndReplaceAsync(Filter{T}, T, ReplaceOptions{T})"/>
     /// <param name="commandOptions"></param>
-    public async Task<T> FindOneAndReplaceAsync(Filter<T> filter, T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
+    public Task<T> FindOneAndReplaceAsync(Filter<T> filter, T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
     {
-        var response = await FindOneAndReplaceAsync<T>(filter, replacement, replaceOptions, commandOptions, false).ConfigureAwait(false);
-        return response;
+        return FindOneAndReplaceAsync<T>(filter, replacement, replaceOptions, commandOptions, false);
     }
 
     /// <summary>
@@ -1035,10 +1030,9 @@ public Task<TResult> FindOneAndReplaceAsync<TResult>(Filter<T> filter, T replace
     /// The FindOneAndReplace alternatives that accept a TResult type parameter allow for deserializing the resulting document
     /// as a different type (most commonly used when using projection to return a subset of fields)
     /// </remarks>
-    public async Task<TResult> FindOneAndReplaceAsync<TResult>(Filter<T> filter, T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
+    public Task<TResult> FindOneAndReplaceAsync<TResult>(Filter<T> filter, T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
     {
-        var response = await FindOneAndReplaceAsync<TResult>(filter, replacement, replaceOptions, commandOptions, false).ConfigureAwait(false);
-        return response;
+        return FindOneAndReplaceAsync<TResult>(filter, replacement, replaceOptions, commandOptions, false);
     }
 
     internal async Task<TResult> FindOneAndReplaceAsync<TResult>(Filter<T> filter, T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions, bool runSynchronously)
@@ -1075,7 +1069,7 @@ public ReplaceResult ReplaceOne(Filter<T> filter, T replacement, ReplaceOptions<
     public ReplaceResult ReplaceOne(Filter<T> filter, T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
     {
         var response = ReplaceOneAsync(filter, replacement, replaceOptions, commandOptions, true).ResultSync();
-        return response.Result;
+        return response;
     }
 
     /// <summary>
@@ -1099,20 +1093,19 @@ public Task<ReplaceResult> ReplaceOneAsync(Filter<T> filter, T replacement, Repl
 
     /// <inheritdoc cref="ReplaceOneAsync(Filter{T}, T, ReplaceOptions{T})"/>
     /// <param name="commandOptions"></param>
-    public async Task<ReplaceResult> ReplaceOneAsync(Filter<T> filter, T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
+    public Task<ReplaceResult> ReplaceOneAsync(Filter<T> filter, T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions)
     {
-        var response = await ReplaceOneAsync(filter, replacement, replaceOptions, commandOptions, false).ConfigureAwait(false);
-        return response.Result;
+        return ReplaceOneAsync(filter, replacement, replaceOptions, commandOptions, false);
     }
 
-    internal async Task<ApiResponseWithStatus<ReplaceResult>> ReplaceOneAsync(Filter<T> filter, T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions, bool runSynchronously)
+    internal async Task<ReplaceResult> ReplaceOneAsync(Filter<T> filter, T replacement, ReplaceOptions<T> replaceOptions, CommandOptions commandOptions, bool runSynchronously)
     {
         replaceOptions.Filter = filter;
         replaceOptions.Replacement = replacement;
         replaceOptions.Projection = new ExclusiveProjectionBuilder<T>().Exclude("*");
         var command = CreateCommand("findOneAndReplace").WithPayload(replaceOptions).AddCommandOptions(commandOptions);
         var response = await command.RunAsyncReturnStatus<ReplaceResult>(runSynchronously).ConfigureAwait(false);
-        return response;
+        return response.Result;
     }
 
     /// <summary>
@@ -1630,7 +1623,7 @@ public UpdateResult UpdateOne(Filter<T> filter, UpdateBuilder<T> update, UpdateO
     public UpdateResult UpdateOne(Filter<T> filter, UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions, CommandOptions commandOptions)
     {
         var response = UpdateOneAsync(filter, update, updateOptions, commandOptions, true).ResultSync();
-        return response.Result;
+        return response;
     }
 
     /// <summary>
@@ -1675,19 +1668,18 @@ public Task<UpdateResult> UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> upda
 
     /// <inheritdoc cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T}, UpdateOneOptions{T})"/>
     /// <param name="commandOptions"></param>
-    public async Task<UpdateResult> UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions, CommandOptions commandOptions)
+    public Task<UpdateResult> UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions, CommandOptions commandOptions)
     {
-        var response = await UpdateOneAsync(filter, update, updateOptions, commandOptions, false).ConfigureAwait(false);
-        return response.Result;
+        return UpdateOneAsync(filter, update, updateOptions, commandOptions, false);
     }
 
-    internal async Task<ApiResponseWithStatus<UpdateResult>> UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions, CommandOptions commandOptions, bool runSynchronously)
+    internal async Task<UpdateResult> UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions, CommandOptions commandOptions, bool runSynchronously)
     {
         updateOptions.Filter = filter;
         updateOptions.Update = update;
         var command = CreateCommand("updateOne").WithPayload(updateOptions).AddCommandOptions(commandOptions);
         var response = await command.RunAsyncReturnStatus<UpdateResult>(runSynchronously).ConfigureAwait(false);
-        return response;
+        return response.Result;
     }
 
     /// <summary>
@@ -1715,7 +1707,7 @@ public UpdateResult UpdateMany(Filter<T> filter, UpdateBuilder<T> update, Update
     public UpdateResult UpdateMany(Filter<T> filter, UpdateBuilder<T> update, UpdateManyOptions<T> updateOptions, CommandOptions commandOptions)
     {
         var response = UpdateManyAsync(filter, update, updateOptions, commandOptions, false).ResultSync();
-        return response.Result;
+        return response;
     }
 
     /// <summary>
@@ -1738,13 +1730,12 @@ public Task<UpdateResult> UpdateManyAsync(Filter<T> filter, UpdateBuilder<T> upd
 
     /// <inheritdoc cref="UpdateManyAsync(Filter{T}, UpdateBuilder{T}, UpdateManyOptions{T})"/>
     /// <param name="commandOptions"></param>
-    public async Task<UpdateResult> UpdateManyAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateManyOptions<T> updateOptions, CommandOptions commandOptions)
+    public Task<UpdateResult> UpdateManyAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateManyOptions<T> updateOptions, CommandOptions commandOptions)
     {
-        var response = await UpdateManyAsync(filter, update, updateOptions, commandOptions, false).ConfigureAwait(false);
-        return response.Result;
+        return UpdateManyAsync(filter, update, updateOptions, commandOptions, false);
     }
 
-    internal async Task<ApiResponseWithStatus<UpdateResult>> UpdateManyAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateManyOptions<T> updateOptions, CommandOptions commandOptions, bool runSynchronously)
+    internal async Task<UpdateResult> UpdateManyAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateManyOptions<T> updateOptions, CommandOptions commandOptions, bool runSynchronously)
     {
         updateOptions.Filter = filter;
         updateOptions.Update = update;
@@ -1767,7 +1758,7 @@ internal async Task<ApiResponseWithStatus<UpdateResult>> UpdateManyAsync(Filter<
                 keepProcessing = false;
             }
         }
-        return new ApiResponseWithStatus<UpdateResult>() { Result = updateResult };
+        return updateResult;
     }
 
     /// <summary>
@@ -1780,10 +1771,10 @@ public DocumentsCountResult CountDocuments()
     }
 
     /// <summary>
-    /// Synchronous version of <see cref="CountDocumentsAsync(CommandOptions)"/>
+    /// Synchronous version of <see cref="CountDocumentsAsync(CountDocumentsCommandOptions)"/>
     /// </summary>
     /// <inheritdoc cref="CountDocumentsAsync(CommandOptions)"/>
-    public DocumentsCountResult CountDocuments(CommandOptions commandOptions)
+    public DocumentsCountResult CountDocuments(CountDocumentsCommandOptions commandOptions)
     {
         return CountDocumentsAsync(null, commandOptions, true).ResultSync();
     }
@@ -1802,7 +1793,7 @@ public Task<DocumentsCountResult> CountDocumentsAsync()
     /// </summary>
     /// <param name="commandOptions"></param>
     /// <returns></returns>
-    public Task<DocumentsCountResult> CountDocumentsAsync(CommandOptions commandOptions)
+    public Task<DocumentsCountResult> CountDocumentsAsync(CountDocumentsCommandOptions commandOptions)
     {
         return CountDocumentsAsync(null, commandOptions, false);
     }
@@ -1817,10 +1808,10 @@ public DocumentsCountResult CountDocuments(Filter<T> filter)
     }
 
     /// <summary>
-    /// Synchronous version of <see cref="CountDocumentsAsync(Filter{T}, CommandOptions)"/>
+    /// Synchronous version of <see cref="CountDocumentsAsync(Filter{T}, CountDocumentsCommandOptions)"/>
     /// </summary>
-    /// <inheritdoc cref="CountDocumentsAsync(Filter{T}, CommandOptions)"/>
-    public DocumentsCountResult CountDocuments(Filter<T> filter, CommandOptions commandOptions)
+    /// <inheritdoc cref="CountDocumentsAsync(Filter{T}, CountDocumentsCommandOptions)"/>
+    public DocumentsCountResult CountDocuments(Filter<T> filter, CountDocumentsCommandOptions commandOptions)
     {
         return CountDocumentsAsync(filter, commandOptions, true).ResultSync();
     }
@@ -1837,12 +1828,12 @@ public Task<DocumentsCountResult> CountDocumentsAsync(Filter<T> filter)
 
     /// <inheritdoc cref="CountDocumentsAsync(Filter{T}"/>
     /// <param name="commandOptions"></param>
-    public Task<DocumentsCountResult> CountDocumentsAsync(Filter<T> filter, CommandOptions commandOptions)
+    public Task<DocumentsCountResult> CountDocumentsAsync(Filter<T> filter, CountDocumentsCommandOptions commandOptions)
     {
         return CountDocumentsAsync(filter, commandOptions, false);
     }
 
-    internal async Task<DocumentsCountResult> CountDocumentsAsync(Filter<T> filter, CommandOptions commandOptions, bool runSynchronously)
+    internal async Task<DocumentsCountResult> CountDocumentsAsync(Filter<T> filter, CountDocumentsCommandOptions commandOptions, bool runSynchronously)
     {
         var findOptions = new DocumentFindOptions<T>()
         {

src/DataStax.AstraDB.DataApi/Core/CollectionDefinition.cs

@@ -16,7 +16,6 @@
 
 using DataStax.AstraDB.DataApi.SerDes;
 using System;
-using System.Collections.ObjectModel;
 using System.Reflection;
 using System.Text.Json.Serialization;
 

src/DataStax.AstraDB.DataApi/Core/Commands/Command.cs

@@ -16,7 +16,6 @@
 
 using DataStax.AstraDB.DataApi.Collections;
 using DataStax.AstraDB.DataApi.SerDes;
-using DataStax.AstraDB.DataApi.Tables;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;

src/DataStax.AstraDB.DataApi/Core/CountDocumentsCommandOptions.cs

@@ -0,0 +1,22 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace DataStax.AstraDB.DataApi.Core;
+
+public class CountDocumentsCommandOptions : CommandOptions
+{
+  public int MaxDocumentsToCount { get; set; } = int.MaxValue;
+}

src/DataStax.AstraDB.DataApi/Core/Database.cs

@@ -967,16 +967,16 @@ public void DropTableIndex(string indexName, DropIndexCommandOptions commandOpti
     /// Drops an index on the table.
     /// </summary>
     /// <param name="indexName">The name of the index to drop</param>
-    public async Task DropTableIndexAsync(string indexName)
+    public Task DropTableIndexAsync(string indexName)
     {
-        await DropTableIndexAsync(indexName, null, false);
+        return DropTableIndexAsync(indexName, null, false);
     }
 
     /// <inheritdoc cref="DropTableIndexAsync(string)"/>
     /// <param name="commandOptions"></param>
-    public async Task DropTableIndexAsync(string indexName, DropIndexCommandOptions commandOptions)
+    public Task DropTableIndexAsync(string indexName, DropIndexCommandOptions commandOptions)
     {
-        await DropTableIndexAsync(indexName, commandOptions, false);
+        return DropTableIndexAsync(indexName, commandOptions, false);
     }
 
     private async Task DropTableIndexAsync(string indexName, DropIndexCommandOptions commandOptions, bool runSynchronously)

src/DataStax.AstraDB.DataApi/Core/Query/FindOptions.cs

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-using MongoDB.Bson;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Serialization;