additional cleanup and hardening per documentation feedback

Author: stephenatsembit

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

@@ -326,7 +326,7 @@ private async Task<T> RunCommandAsync<T>(HttpMethod method, bool runSynchronousl
                         responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                         MaybeLogDebugMessage("Response Status Code: {StatusCode}", response.StatusCode);
                         MaybeLogDebugMessage("Content: {Content}", responseContent);
-                        throw new HttpRequestException($"Request to failed with status code {response.StatusCode}.");
+                        throw new HttpRequestException($"Request failed with status code {response.StatusCode}.");
                     }
                 }
                 responseContent = await response.Content.ReadAsStringAsync().ConfigureAwait(false);

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

@@ -905,7 +905,7 @@ private async Task<IEnumerable<TableInfo>> ListTablesAsync(DatabaseCommandOption
     /// Synchronous version of <see cref="ListTableNamesAsync()"/>
     /// </summary>
     /// <returns></returns>
-    public IEnumerable<string> ListTableNames()
+    public List<string> ListTableNames()
     {
         return ListTableNames(null);
     }
@@ -915,7 +915,7 @@ public IEnumerable<string> ListTableNames()
     /// </summary>
     /// <param name="options">The options to use for the command, useful for overriding the keyspace, for example.</param>
     /// <returns></returns>
-    public IEnumerable<string> ListTableNames(DatabaseCommandOptions options)
+    public List<string> ListTableNames(DatabaseCommandOptions options)
     {
         return ListTableNamesAsync(options, true, true).ResultSync();
     }
@@ -924,7 +924,7 @@ public IEnumerable<string> ListTableNames(DatabaseCommandOptions options)
     /// List the tables in the database.
     /// </summary>
     /// <returns></returns>
-    public Task<IEnumerable<string>> ListTableNamesAsync()
+    public Task<List<string>> ListTableNamesAsync()
     {
         return ListTableNamesAsync(null);
     }
@@ -934,12 +934,12 @@ public Task<IEnumerable<string>> ListTableNamesAsync()
     /// </summary>
     /// <param name="options">The options to use for the command, useful for overriding the keyspace, for example.</param>
     /// <returns></returns>
-    public Task<IEnumerable<string>> ListTableNamesAsync(DatabaseCommandOptions options)
+    public Task<List<string>> ListTableNamesAsync(DatabaseCommandOptions options)
     {
         return ListTableNamesAsync(options, true, false);
     }
 
-    private async Task<IEnumerable<string>> ListTableNamesAsync(DatabaseCommandOptions options, bool includeDetails, bool runSynchronously)
+    private async Task<List<string>> ListTableNamesAsync(DatabaseCommandOptions options, bool includeDetails, bool runSynchronously)
     {
         var payload = new
         {

src/DataStax.AstraDB.DataApi/Core/Results/ListTableNamesResult.cs

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace DataStax.AstraDB.DataApi.Core.Results;
@@ -24,8 +25,8 @@ namespace DataStax.AstraDB.DataApi.Core.Results;
 public class ListTableNamesResult
 {
     /// <summary>
-    /// An array of table names.
+    /// The list of table names.
     /// </summary>
     [JsonPropertyName("tables")]
-    public string[] Tables { get; set; }
+    public List<string> Tables { get; set; }
 }

src/DataStax.AstraDB.DataApi/SerDes/TableInsertManyResultConverter.cs

@@ -14,24 +14,33 @@
  * limitations under the License.
  */
 
+using DataStax.AstraDB.DataApi.Core.Results;
+using DataStax.AstraDB.DataApi.Tables;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using DataStax.AstraDB.DataApi.Core.Results;
-using DataStax.AstraDB.DataApi.Tables;
 
 namespace DataStax.AstraDB.DataApi.SerDes;
 
-public class TableInsertManyResultConverter : JsonConverter<TableInsertManyResult>
+internal class TableInsertOneResultConverter : TableInsertResultConverter<TableInsertOneResult>
 {
-    public override TableInsertManyResult Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+}
+
+internal class TableInsertManyResultConverter : TableInsertResultConverter<TableInsertManyResult>
+{
+}
+
+internal class TableInsertResultConverter<T> : JsonConverter<T> where T : TableInsertManyResult, new()
+{
+
+    public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         if (reader.TokenType != JsonTokenType.StartObject)
             throw new JsonException("Expected StartObject token");
 
-        var result = new TableInsertManyResult();
+        var result = new T();
         JsonDocument insertedIdsDoc = null;
         JsonDocument documentResponsesDoc = null;
 
@@ -207,7 +216,7 @@ private object DeserializeValue(JsonElement element, PrimaryKeySchema schema, Js
         }
     }
 
-    public override void Write(Utf8JsonWriter writer, TableInsertManyResult value, JsonSerializerOptions options)
+    public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
     {
         throw new NotSupportedException("Serialization is not implemented for TableInsertManyResult");
     }

src/DataStax.AstraDB.DataApi/Tables/Table.cs

@@ -386,7 +386,7 @@ private async Task<TableInsertManyResult> RunInsertManyAsync(IEnumerable<T> rows
     /// Synchronous version of <see cref="InsertOneAsync(T)"/>
     /// </summary>
     /// <inheritdoc cref="InsertOneAsync(T)"/>
-    public TableInsertManyResult InsertOne(T row)
+    public TableInsertOneResult InsertOne(T row)
     {
         return InsertOne(row, null);
     }
@@ -395,7 +395,7 @@ public TableInsertManyResult InsertOne(T row)
     /// Synchronous version of <see cref="InsertOneAsync(T, CommandOptions)"/>
     /// </summary>
     /// <inheritdoc cref="InsertOneAsync(T, CommandOptions)"/>
-    public TableInsertManyResult InsertOne(T row, CommandOptions commandOptions)
+    public TableInsertOneResult InsertOne(T row, CommandOptions commandOptions)
     {
         return InsertOneAsync(row, commandOptions, true).ResultSync();
     }
@@ -405,27 +405,27 @@ public TableInsertManyResult InsertOne(T row, CommandOptions commandOptions)
     /// </summary>
     /// <param name="row"></param>
     /// <returns></returns>
-    public Task<TableInsertManyResult> InsertOneAsync(T row)
+    public Task<TableInsertOneResult> InsertOneAsync(T row)
     {
         return InsertOneAsync(row, null);
     }
 
     /// <inheritdoc cref="InsertOneAsync(T)"/>
     /// <param name="commandOptions"></param>
-    public Task<TableInsertManyResult> InsertOneAsync(T row, CommandOptions commandOptions)
+    public Task<TableInsertOneResult> InsertOneAsync(T row, CommandOptions commandOptions)
     {
         return InsertOneAsync(row, commandOptions, false);
     }
 
-    private async Task<TableInsertManyResult> InsertOneAsync(T row, CommandOptions commandOptions, bool runSynchronously)
+    private async Task<TableInsertOneResult> InsertOneAsync(T row, CommandOptions commandOptions, bool runSynchronously)
     {
         var payload = new
         {
             document = row,
         };
         commandOptions = SetRowSerializationOptions<T>(commandOptions, true);
         var command = CreateCommand("insertOne").WithPayload(payload).AddCommandOptions(commandOptions);
-        var response = await command.RunAsyncReturnStatus<TableInsertManyResult>(runSynchronously).ConfigureAwait(false);
+        var response = await command.RunAsyncReturnStatus<TableInsertOneResult>(runSynchronously).ConfigureAwait(false);
         return response.Result;
     }
 
@@ -738,105 +738,52 @@ private CommandOptions SetRowSerializationOptions<TResult>(CommandOptions comman
         return commandOptions;
     }
 
-    /// <summary>
-    /// Synchronous version of <see cref="UpdateOneAsync(UpdateBuilder{T}, UpdateOneOptions{T})"/>
-    /// </summary>
-    /// <inheritdoc cref="UpdateOneAsync(UpdateBuilder{T}, UpdateOneOptions{T})"/>
-    public UpdateResult UpdateOne(UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions)
-    {
-        return UpdateOne(null, update, updateOptions, null);
-    }
-
-    /// <summary>
-    /// Synchronous version of <see cref="UpdateOneAsync(UpdateBuilder{T}, UpdateOneOptions{T}, CommandOptions)"/>
-    /// </summary>
-    /// <inheritdoc cref="UpdateOneAsync(UpdateBuilder{T}, UpdateOneOptions{T}, CommandOptions)"/>
-    public UpdateResult UpdateOne(UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions, CommandOptions commandOptions)
-    {
-        return UpdateOne(null, update, updateOptions, commandOptions);
-    }
-
     /// <summary>
     /// Synchronous version of <see cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T})"/>
     /// </summary>
     /// <inheritdoc cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T})"/>
-    public UpdateResult UpdateOne(Filter<T> filter, UpdateBuilder<T> update)
-    {
-        return UpdateOne(filter, update, new UpdateOneOptions<T>(), null);
-    }
-
-    /// <summary>
-    /// Synchronous version of <see cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T}, UpdateOneOptions{T})"/>
-    /// </summary>
-    /// <inheritdoc cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T}, UpdateOneOptions{T})"/>
-    public UpdateResult UpdateOne(Filter<T> filter, UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions)
+    public void UpdateOne(Filter<T> filter, UpdateBuilder<T> update)
     {
-        return UpdateOne(filter, update, updateOptions, null);
+        UpdateOne(filter, update, null);
     }
 
     /// <summary>
-    /// Synchronous version of <see cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T}, UpdateOneOptions{T}, CommandOptions)"/>
+    /// Synchronous version of <see cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T}, CommandOptions)"/>
     /// </summary>
-    /// <inheritdoc cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T}, UpdateOneOptions{T}, CommandOptions)"/>
-    public UpdateResult UpdateOne(Filter<T> filter, UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions, CommandOptions commandOptions)
+    /// <inheritdoc cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T}, CommandOptions)"/>
+    public void UpdateOne(Filter<T> filter, UpdateBuilder<T> update, CommandOptions commandOptions)
     {
-        var response = UpdateOneAsync(filter, update, updateOptions, commandOptions, true).ResultSync();
-        return response;
-    }
-
-    /// <summary>
-    /// Update a single row in the table using the provided update builder and options.
-    ///</summary>
-    /// <param name="update"></param>
-    /// <param name="updateOptions"></param>
-    /// <returns></returns>
-    public Task<UpdateResult> UpdateOneAsync(UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions)
-    {
-        return UpdateOneAsync(null, update, updateOptions, null);
-    }
-
-    /// <inheritdoc cref="UpdateOneAsync(UpdateBuilder{T}, UpdateOneOptions{T})"/>
-    /// <param name="commandOptions"></param>
-    public Task<UpdateResult> UpdateOneAsync(UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions, CommandOptions commandOptions)
-    {
-        return UpdateOneAsync(null, update, updateOptions, commandOptions);
+        UpdateOneAsync(filter, update, commandOptions, true).ResultSync();
     }
 
     /// <summary>
     /// Update a single row in the table using the provided filter and update builder.
     /// 
-    /// This is similar to <see cref="FindOneAndUpdateAsync(Filter{T}, UpdateBuilder{T})"/> but does not return the updated document.
     /// </summary>
     /// <param name="filter"></param>
     /// <param name="update"></param>
     /// <returns></returns>
-    public Task<UpdateResult> UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update)
+    public Task UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update)
     {
-        return UpdateOneAsync(filter, update, null, null);
+        return UpdateOneAsync(filter, update, null);
     }
 
     /// <inheritdoc cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T})"/>
-    /// <param name="updateOptions"></param>
-    public Task<UpdateResult> UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions)
-    {
-        return UpdateOneAsync(filter, update, updateOptions, null);
-    }
-
-    /// <inheritdoc cref="UpdateOneAsync(Filter{T}, UpdateBuilder{T}, UpdateOneOptions{T})"/>
     /// <param name="commandOptions"></param>
-    public Task<UpdateResult> UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions, CommandOptions commandOptions)
+    public Task UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update, CommandOptions commandOptions)
     {
-        return UpdateOneAsync(filter, update, updateOptions, commandOptions, false);
+        return UpdateOneAsync(filter, update, commandOptions, false);
     }
 
-    internal async Task<UpdateResult> UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update, UpdateOneOptions<T> updateOptions, CommandOptions commandOptions, bool runSynchronously)
+    internal async Task UpdateOneAsync(Filter<T> filter, UpdateBuilder<T> update, CommandOptions commandOptions, bool runSynchronously)
     {
-        updateOptions = updateOptions ?? new UpdateOneOptions<T>();
-        updateOptions.Filter = filter;
-        updateOptions.Update = update;
+        var updateOptions = new UpdateOneOptions<T>
+        {
+            Filter = filter,
+            Update = update
+        };
         var command = CreateCommand("updateOne").WithPayload(updateOptions).AddCommandOptions(commandOptions);
-        var response = await command.RunAsyncReturnStatus<UpdateResult>(runSynchronously).ConfigureAwait(false);
-        return response.Result;
+        await command.RunAsyncReturnStatus<UpdateResult>(runSynchronously).ConfigureAwait(false);
     }
 
     /// <summary>
@@ -944,6 +891,7 @@ public Task<DeleteResult> DeleteOneAsync(Filter<T> filter, TableDeleteOptions<T>
 
     internal async Task<DeleteResult> DeleteOneAsync(Filter<T> filter, TableDeleteOptions<T> deleteOptions, CommandOptions commandOptions, bool runSynchronously)
     {
+        deleteOptions ??= new TableDeleteOptions<T>();
         deleteOptions.Filter = filter;
         var command = CreateCommand("deleteOne").WithPayload(deleteOptions).AddCommandOptions(commandOptions);
         var response = await command.RunAsyncReturnStatus<DeleteResult>(runSynchronously).ConfigureAwait(false);