Allow for strongly-typed query properties

Tests/ksqlDB.RestApi.Client.IntegrationTests/KSql/Linq/ComplexTypesTests.cs

@@ -5,6 +5,7 @@
 using ksqlDB.RestApi.Client.KSql.Linq;
 using ksqlDB.RestApi.Client.KSql.Query.Context;
 using ksqlDB.RestApi.Client.KSql.Query.Functions;
+using ksqlDB.RestApi.Client.KSql.Query.Options;
 using ksqlDB.RestApi.Client.KSql.RestApi;
 using ksqlDB.RestApi.Client.KSql.RestApi.Parameters;
 using ksqlDB.RestApi.Client.KSql.RestApi.Statements;
@@ -110,9 +111,9 @@ public void TransformMap_WithNestedMap()
 
     QueryStreamParameters queryStreamParameters = new()
     {
-      Sql = ksql,
-      [QueryStreamParameters.AutoOffsetResetPropertyName] = "earliest",
+      Sql = ksql
     };
+    queryStreamParameters.Set(QueryStreamParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Earliest);
 
     //Act
     var source = Context.CreatePushQuery<Foo>(queryStreamParameters)
@@ -147,9 +148,9 @@ public void TransformMap_WithNestedStruct()
 
     QueryStreamParameters queryStreamParameters = new()
     {
-      Sql = ksql,
-      [QueryStreamParameters.AutoOffsetResetPropertyName] = "earliest",
+      Sql = ksql
     };
+    queryStreamParameters.Set(QueryStreamParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Earliest);
 
     //Act
     var source = Context.CreatePushQuery<Foo>(queryStreamParameters)

Tests/ksqlDB.RestApi.Client.IntegrationTests/KSql/Linq/QbservableExtensionsTests.cs

@@ -445,8 +445,8 @@ public async Task QueryRawKSql()
     QueryStreamParameters queryParameters = new()
     {
       Sql = ksql,
-      [QueryStreamParameters.AutoOffsetResetPropertyName] = "earliest",
     };
+    queryParameters.Set(QueryStreamParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Earliest);
 
     var source = Context.CreatePushQuery<Tweet>(queryParameters);
 
@@ -467,9 +467,9 @@ public async Task QueryStreamRawKSql()
 
     QueryStreamParameters queryStreamParameters = new()
     {
-      Sql = ksql,
-      [QueryStreamParameters.AutoOffsetResetPropertyName] = "earliest",
+      Sql = ksql
     };
+    queryStreamParameters.Set(QueryStreamParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Earliest);
 
     var source = Context.CreatePushQuery<Tweet>(queryStreamParameters);
 
@@ -656,9 +656,9 @@ public async Task SelectAsInt()
 
     QueryStreamParameters queryStreamParameters = new()
     {
-      Sql = ksql,
-      [QueryParameters.AutoOffsetResetPropertyName] = "earliest",
+      Sql = ksql
     };
+    queryStreamParameters.Set(QueryStreamParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Earliest);
 
     var source = Context.CreatePushQuery<int>(queryStreamParameters);
 
@@ -680,9 +680,9 @@ public async Task SelectAsArray()
 
     QueryStreamParameters queryStreamParameters = new()
     {
-      Sql = ksql,
-      [QueryParameters.AutoOffsetResetPropertyName] = "earliest",
+      Sql = ksql
     };
+    queryStreamParameters.Set(QueryStreamParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Earliest);
 
     var source = Context.CreatePushQuery<int[]>(queryStreamParameters);
 
@@ -709,9 +709,9 @@ public async Task SelectAsStruct()
 
     QueryStreamParameters queryStreamParameters = new()
     {
-      Sql = ksql,
-      [QueryParameters.AutoOffsetResetPropertyName] = "earliest",
+      Sql = ksql
     };
+    queryStreamParameters.Set(QueryStreamParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Earliest);
 
     var source = Context.CreatePushQuery<MyStruct>(queryStreamParameters);
 

Tests/ksqlDB.RestApi.Client.Tests/DependencyInjection/KSqlDbServiceCollectionExtensionsTests.cs

@@ -35,7 +35,7 @@ public void ConfigureKSqlDb_IKSqlDBContext()
 
     //Assert
     var descriptor = ClassUnderTest.TryGetRegistration<IKSqlDBContext>();
-        
+
     descriptor.Should().NotBeNull();
     descriptor!.Lifetime.Should().Be(ServiceLifetime.Scoped);
   }
@@ -53,7 +53,7 @@ public void ConfigureKSqlDb_SetupParametersAction()
 
     //Assert
     var descriptor = ClassUnderTest.TryGetRegistration<IKSqlDBContext>();
-        
+
     descriptor.Should().NotBeNull();
     descriptor!.Lifetime.Should().Be(ServiceLifetime.Scoped);
   }
@@ -72,7 +72,7 @@ public void ConfigureKSqlDb_BuildServiceProviderAndResolve()
 
     //Assert
     context.Should().NotBeNull();
-    context?.ContextOptions.QueryStreamParameters[KSqlDbConfigs.ProcessingGuarantee].ToProcessingGuarantee().Should().Be(ProcessingGuarantee.AtLeastOnce);
+    context?.ContextOptions.QueryStreamParameters.Get<ProcessingGuarantee>(KSqlDbConfigs.ProcessingGuarantee).Should().Be(ProcessingGuarantee.AtLeastOnce);
   }
 
   [Test]
@@ -85,7 +85,7 @@ public void ConfigureKSqlDb_IKSqlDbRestApiClient()
 
     //Assert
     var descriptor = ClassUnderTest.TryGetRegistration<IKSqlDbRestApiClient>();
-        
+
     descriptor.Should().NotBeNull();
     descriptor!.Lifetime.Should().Be(ServiceLifetime.Scoped);
   }
@@ -113,7 +113,7 @@ public void ConfigureKSqlDb_IHttpClientFactory()
 
     //Assert
     var descriptor = ClassUnderTest.TryGetRegistration<IHttpClientFactory>();
-        
+
     descriptor.Should().NotBeNull();
     descriptor!.Lifetime.Should().Be(ServiceLifetime.Transient);
   }
@@ -128,7 +128,7 @@ public void ConfigureKSqlDb_KSqlDBContextOptions()
 
     //Assert
     var descriptor = ClassUnderTest.TryGetRegistration<KSqlDBContextOptions>();
-        
+
     descriptor.Should().NotBeNull();
     descriptor!.Lifetime.Should().Be(ServiceLifetime.Singleton);
   }
@@ -174,7 +174,7 @@ public void AddDbContext_RegisterAsInterface()
     //Assert
     context.Should().NotBeNull();
   }
-    
+
   [Test]
   public void AddDbContext_KSqlDBContext_DefaultLifetimeIsScoped()
   {
@@ -188,7 +188,7 @@ public void AddDbContext_KSqlDBContext_DefaultLifetimeIsScoped()
     descriptor.Should().NotBeNull();
     descriptor!.Lifetime.Should().Be(ServiceLifetime.Scoped);
   }
-    
+
   [Test]
   public void AddDbContext_KSqlDBContext_ContextLifetimeChangedToTransientScope()
   {
@@ -239,9 +239,9 @@ public void AddDbContext_RestApiLifetimeChangedToTransientScope()
     descriptor.Should().NotBeNull();
     descriptor!.Lifetime.Should().Be(ServiceLifetime.Transient);
   }
-    
+
   #endregion
-    
+
   #region ContextFactory
 
   [Test]

Tests/ksqlDB.RestApi.Client.Tests/Infrastructure/Attributes/JsonCamelCaseStringEnumConverterAttributeTests.cs

@@ -0,0 +1,29 @@
+using System.Text.Json.Serialization;
+using FluentAssertions;
+using ksqlDb.RestApi.Client.Infrastructure.Attributes;
+using NUnit.Framework;
+
+namespace ksqlDb.RestApi.Client.Tests.Infrastructure.Attributes
+{
+  enum TestEnum
+  {
+    A,
+    B
+  }
+
+  public class JsonSnakeCaseStringEnumConverterAttributeTests
+  {
+    [Test]
+    public void CreatesConverter()
+    {
+      // Arrange
+      var attr = new JsonSnakeCaseStringEnumConverterAttribute<TestEnum>();
+
+      // Act
+      var converter = attr.CreateConverter(typeof(TestEnum));
+
+      // Assert
+      converter.Should().BeOfType<JsonStringEnumConverter<TestEnum>>();
+    }
+  }
+}

Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Context/KSqlDBContextOptionsTests.cs

@@ -32,7 +32,7 @@ public void Url_ShouldNotBeEmpty()
     //Assert
     url.Should().Be(TestParameters.KsqlDbUrl);
   }
-    
+
   [Test]
   public void NotSetBasicAuthCredentials()
   {
@@ -45,7 +45,7 @@ public void NotSetBasicAuthCredentials()
     ClassUnderTest.BasicAuthUserName.Should().BeEmpty();
     ClassUnderTest.BasicAuthPassword.Should().BeEmpty();
   }
-    
+
   [Test]
   public void SetBasicAuthCredentials()
   {
@@ -73,7 +73,7 @@ public void SetProcessingGuarantee_WasNotSet()
 
     //Assert
     Assert.ThrowsException<KeyNotFoundException>(() =>
-      ClassUnderTest.QueryStreamParameters[parameterName].Should().BeEmpty());
+      ClassUnderTest.QueryStreamParameters.Get<ProcessingGuarantee>(parameterName));
   }
 
   [Test]
@@ -87,9 +87,7 @@ public void SetProcessingGuarantee_SetToAtLeastOnce()
     ClassUnderTest.SetProcessingGuarantee(processingGuarantee);
 
     //Assert
-    string expectedValue = "at_least_once";
-
-    ClassUnderTest.QueryStreamParameters[parameterName].Should().Be(expectedValue);
+    ClassUnderTest.QueryStreamParameters.Get<ProcessingGuarantee>(parameterName).Should().Be(processingGuarantee);
   }
 
   [Test]
@@ -103,9 +101,7 @@ public void SetProcessingGuarantee_SetToExactlyOnce()
     ClassUnderTest.SetProcessingGuarantee(processingGuarantee);
 
     //Assert
-    string expectedValue = "exactly_once";
-
-    ClassUnderTest.QueryStreamParameters[parameterName].Should().Be(expectedValue);
+    ClassUnderTest.QueryStreamParameters.Get<ProcessingGuarantee>(parameterName).Should().Be(processingGuarantee);
   }
 
   [Test]
@@ -119,9 +115,7 @@ public void SetProcessingGuarantee_SetToExactlyOnceV2()
     ClassUnderTest.SetProcessingGuarantee(processingGuarantee);
 
     //Assert
-    string expectedValue = "exactly_once_v2";
-
-    ClassUnderTest.QueryStreamParameters[parameterName].Should().Be(expectedValue);
+    ClassUnderTest.QueryStreamParameters.Get<ProcessingGuarantee>(parameterName).Should().Be(processingGuarantee);
   }
 
   [Test]
@@ -134,12 +128,10 @@ public void SetAutoOffsetReset()
     ClassUnderTest.SetAutoOffsetReset(autoOffsetReset);
 
     //Assert
-    string expectedValue = autoOffsetReset.ToString().ToLower();
-
-    ClassUnderTest.QueryStreamParameters[QueryStreamParameters.AutoOffsetResetPropertyName].Should().Be(expectedValue);
+    ClassUnderTest.QueryStreamParameters.Get<AutoOffsetReset>(QueryStreamParameters.AutoOffsetResetPropertyName).Should().Be(autoOffsetReset);
   }
 
-    
+
   [Test]
   public void JsonSerializerOptions()
   {

Tests/ksqlDB.RestApi.Client.Tests/KSql/Query/Context/KSqlDBContextTests.cs

@@ -41,13 +41,8 @@ public void CreatePushQuery_Subscribe_KSqlDbProvidersRunWasCalled()
   public void CreateStreamSet_Subscribe_QueryOptionsWereTakenFromContext()
   {
     //Arrange
-    var contextOptions = new KSqlDBContextOptions(TestParameters.KsqlDbUrl)
-    {
-      QueryStreamParameters =
-      {
-        [QueryParameters.AutoOffsetResetPropertyName] = AutoOffsetReset.Latest.ToString()
-      }
-    };
+    var contextOptions = new KSqlDBContextOptions(TestParameters.KsqlDbUrl);
+    contextOptions.QueryStreamParameters.Set(QueryParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Latest);
 
     var context = new TestableDbProvider<string>(contextOptions);
 
@@ -56,7 +51,7 @@ public void CreateStreamSet_Subscribe_QueryOptionsWereTakenFromContext()
 
     //Assert
     context.KSqlDbProviderMock.Verify(
-      c => c.Run<string>(It.Is<QueryStreamParameters>(c => c[QueryParameters.AutoOffsetResetPropertyName] == "Latest"),
+      c => c.Run<string>(It.Is<QueryStreamParameters>(c => c.Get<AutoOffsetReset>(QueryParameters.AutoOffsetResetPropertyName) == AutoOffsetReset.Latest),
         It.IsAny<CancellationToken>()), Times.Once);
   }
 
@@ -97,7 +92,7 @@ public void SetAutoOffsetReset_Subscribe_ProcessingGuarantee()
 
     //Assert
     context.KSqlDbProviderMock.Verify(
-      c => c.Run<string>(It.Is<QueryStreamParameters>(c => c["auto.offset.reset"] == "latest"),
+      c => c.Run<string>(It.Is<QueryStreamParameters>(c => c.Get<AutoOffsetReset>("auto.offset.reset") == AutoOffsetReset.Latest),
         It.IsAny<CancellationToken>()), Times.Once);
   }
 
@@ -115,7 +110,7 @@ public void CreateStreamSet_Subscribe_ProcessingGuarantee()
 
     //Assert
     context.KSqlDbProviderMock.Verify(
-      c => c.Run<string>(It.Is<QueryStreamParameters>(c => c[KSqlDbConfigs.ProcessingGuarantee] == "exactly_once"),
+      c => c.Run<string>(It.Is<QueryStreamParameters>(c => c.Get<ProcessingGuarantee>(KSqlDbConfigs.ProcessingGuarantee) == ProcessingGuarantee.ExactlyOnce),
         It.IsAny<CancellationToken>()), Times.Once);
   }
 
@@ -136,13 +131,8 @@ public void CreateStreamSet_CalledMultipleTimes_KSqlQueryGeneratorBuildKSqlWasNo
   public void CreateStreamSet_Subscribe_KSqlQueryGenerator()
   {
     //Arrange
-    var contextOptions = new KSqlDBContextOptions(TestParameters.KsqlDbUrl)
-    {
-      QueryStreamParameters =
-      {
-        ["auto.offset.reset"] = "latest"
-      }
-    };
+    var contextOptions = new KSqlDBContextOptions(TestParameters.KsqlDbUrl);
+    contextOptions.QueryStreamParameters.Set("auto.offset.reset", AutoOffsetReset.Latest);
 
     var context = new TestableDbProvider<string>(contextOptions);
 
@@ -151,7 +141,7 @@ public void CreateStreamSet_Subscribe_KSqlQueryGenerator()
 
     //Assert
     context.KSqlDbProviderMock.Verify(
-      c => c.Run<string>(It.Is<QueryStreamParameters>(parameters => parameters["auto.offset.reset"] == "latest"),
+      c => c.Run<string>(It.Is<QueryStreamParameters>(parameters => parameters.Get<AutoOffsetReset>("auto.offset.reset") == AutoOffsetReset.Latest),
         It.IsAny<CancellationToken>()), Times.Once);
   }
 
@@ -190,9 +180,9 @@ public void CreatePushQuery_RawKSQL_ReturnAsyncEnumerable()
 
     QueryStreamParameters queryStreamParameters = new QueryStreamParameters
     {
-      Sql = ksql,
-      [QueryStreamParameters.AutoOffsetResetPropertyName] = "earliest",
+      Sql = ksql
     };
+    queryStreamParameters.Set(QueryStreamParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Earliest);
 
     var context = new TestableDbProvider<string>(TestParameters.KsqlDbUrl);
 
@@ -212,9 +202,9 @@ public void CreatePushQuery_InvalidQueryParameterTypeThrows()
 
     var queryParameters = new QueryParameters
     {
-      Sql = ksql,
-      [QueryParameters.AutoOffsetResetPropertyName] = "earliest",
+      Sql = ksql
     };
+    queryParameters.Set(QueryStreamParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Earliest);
 
     var context = new TestableDbProvider<string>(TestParameters.KsqlDbUrl);
 
@@ -234,9 +224,9 @@ public void CreateQuery_RawKSQL_ReturnAsyncEnumerable()
 
     QueryStreamParameters queryParameters = new QueryStreamParameters
     {
-      Sql = ksql,
-      [QueryStreamParameters.AutoOffsetResetPropertyName] = "earliest",
+      Sql = ksql
     };
+    queryParameters.Set(QueryStreamParameters.AutoOffsetResetPropertyName, AutoOffsetReset.Earliest);
 
     var context = new TestableDbProvider<string>(TestParameters.KsqlDbUrl);