From c6aad5f39668540c3be8300b381feb1ea78c8aec Mon Sep 17 00:00:00 2001 From: Daniel Weber Date: Thu, 8 Aug 2024 14:46:09 +0200 Subject: [PATCH] Make TransformQuerySource synchronous. --- ...jectionValueProtectionSerializationTest.cs | 2 +- .../NoPasswordIntegrationTests.cs | 2 +- .../WrongPasswordIntegrationTests.cs | 2 +- .../Tests.Fixtures/CosmosDbEmulatorFixture.cs | 33 +++++++++---------- test/Tests.Fixtures/CosmosDbFixture.cs | 2 +- .../ElasticSearchNeptuneFixture.cs | 2 +- .../GremlinServerContainerFixture.cs | 2 +- test/Tests.Fixtures/GremlinServerFixture.cs | 2 +- ...ServerWithoutProjectionContainerFixture.cs | 2 +- .../GroovyGremlinQuerySerializationFixture.cs | 2 +- .../JanusGraphContainerFixture.cs | 2 +- test/Tests.Fixtures/JanusGraphFixture.cs | 2 +- .../Tests.Fixtures/NeptuneContainerFixture.cs | 2 +- test/Tests.Fixtures/NeptuneFixture.cs | 2 +- ...ordSecuredGremlinServerContainerFixture.cs | 2 +- ...estMessageWithAliasGremlinServerFixture.cs | 2 +- test/Tests.Fixtures/TestContainerFixture.cs | 6 ++-- test/Tests.Infrastructure/GremlinqFixture.cs | 4 +-- 18 files changed, 35 insertions(+), 38 deletions(-) diff --git a/test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.cs b/test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.cs index d5638c771..965c6a5dd 100644 --- a/test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.cs +++ b/test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.cs @@ -7,7 +7,7 @@ public class EmptyProjectionValueProtectionSerializationTest : QueryExecutionTes { public class EmptyProjectionValueProtectionFixture : GremlinqFixture { - protected override async Task TransformQuerySource(IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g .ConfigureEnvironment(_ => _ .ConfigureOptions(o => o.SetValue(GremlinqOption.EnableEmptyProjectionValueProtection, true))); } diff --git a/test/Providers.CosmosDb.Tests/NoPasswordIntegrationTests.cs b/test/Providers.CosmosDb.Tests/NoPasswordIntegrationTests.cs index e90132d70..59108124d 100644 --- a/test/Providers.CosmosDb.Tests/NoPasswordIntegrationTests.cs +++ b/test/Providers.CosmosDb.Tests/NoPasswordIntegrationTests.cs @@ -20,7 +20,7 @@ public class NoPasswordFixture : GremlinqFixture private const string CosmosDbEmulatorDatabaseName = "db"; private const string CosmosDbEmulatorCollectionName = "graph"; - protected override async Task TransformQuerySource(IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g .UseCosmosDb(conf => conf .At(new Uri("ws://localhost:8901"), CosmosDbEmulatorDatabaseName, CosmosDbEmulatorCollectionName) .WithPartitionKey(x => x.Label!) diff --git a/test/Providers.GremlinServer.Tests/WrongPasswordIntegrationTests.cs b/test/Providers.GremlinServer.Tests/WrongPasswordIntegrationTests.cs index f686642e0..e428dce12 100644 --- a/test/Providers.GremlinServer.Tests/WrongPasswordIntegrationTests.cs +++ b/test/Providers.GremlinServer.Tests/WrongPasswordIntegrationTests.cs @@ -23,7 +23,7 @@ public WrongPasswordGremlinServerContainerFixture() : base("PasswordSecureGremli { } - protected override async Task TransformQuerySource(IContainer container, IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g .UseGremlinServer(_ => _ .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri) .ConfigureClientFactory(factory => factory diff --git a/test/Tests.Fixtures/CosmosDbEmulatorFixture.cs b/test/Tests.Fixtures/CosmosDbEmulatorFixture.cs index e58b6d4eb..745472651 100644 --- a/test/Tests.Fixtures/CosmosDbEmulatorFixture.cs +++ b/test/Tests.Fixtures/CosmosDbEmulatorFixture.cs @@ -54,23 +54,20 @@ await cosmosClient await base.DisposeAsync(); } - protected override async Task TransformQuerySource(IGremlinQuerySource g) - { - return g - .UseCosmosDb(conf => conf - .At(new Uri("ws://localhost:8901"), CosmosDbEmulatorDatabaseName, _collectionName) - .AuthenticateBy(CosmosDbEmulatorAuthKey) - .WithPartitionKey(x => x.PartitionKey!) - .UseNewtonsoftJson() - .ConfigureClientFactory(factory => factory - .ConfigureClient(client => client - .ObserveResultStatusAttributes((_, attributes) => - { - Console.WriteLine(JsonSerializer.Serialize(attributes)); - })))) - .ConfigureEnvironment(env => env - .ConfigureOptions(options => options - .SetValue(GremlinqOption.StringComparisonTranslationStrictness, StringComparisonTranslationStrictness.Lenient))); - } + protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g + .UseCosmosDb(conf => conf + .At(new Uri("ws://localhost:8901"), CosmosDbEmulatorDatabaseName, _collectionName) + .AuthenticateBy(CosmosDbEmulatorAuthKey) + .WithPartitionKey(x => x.PartitionKey!) + .UseNewtonsoftJson() + .ConfigureClientFactory(factory => factory + .ConfigureClient(client => client + .ObserveResultStatusAttributes((_, attributes) => + { + Console.WriteLine(JsonSerializer.Serialize(attributes)); + })))) + .ConfigureEnvironment(env => env + .ConfigureOptions(options => options + .SetValue(GremlinqOption.StringComparisonTranslationStrictness, StringComparisonTranslationStrictness.Lenient))); } } diff --git a/test/Tests.Fixtures/CosmosDbFixture.cs b/test/Tests.Fixtures/CosmosDbFixture.cs index 7cc4b0317..438a1c02b 100644 --- a/test/Tests.Fixtures/CosmosDbFixture.cs +++ b/test/Tests.Fixtures/CosmosDbFixture.cs @@ -8,7 +8,7 @@ namespace ExRam.Gremlinq.Tests.Fixtures { public class CosmosDbFixture : GremlinqFixture { - protected override async Task TransformQuerySource(IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g .UseCosmosDb( builder => builder .AtLocalhost("db", "graph") diff --git a/test/Tests.Fixtures/ElasticSearchNeptuneFixture.cs b/test/Tests.Fixtures/ElasticSearchNeptuneFixture.cs index c9c3f19c4..5fb4bb442 100644 --- a/test/Tests.Fixtures/ElasticSearchNeptuneFixture.cs +++ b/test/Tests.Fixtures/ElasticSearchNeptuneFixture.cs @@ -8,7 +8,7 @@ namespace ExRam.Gremlinq.Providers.Neptune.Tests { public class ElasticSearchNeptuneFixture : GremlinqFixture { - protected override async Task TransformQuerySource(IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g .UseNeptune(builder => builder .AtLocalhost() .UseElasticSearch(new Uri("http://elastic.search.server"))) diff --git a/test/Tests.Fixtures/GremlinServerContainerFixture.cs b/test/Tests.Fixtures/GremlinServerContainerFixture.cs index 9d0fcc399..b8f6e2637 100644 --- a/test/Tests.Fixtures/GremlinServerContainerFixture.cs +++ b/test/Tests.Fixtures/GremlinServerContainerFixture.cs @@ -13,7 +13,7 @@ public GremlinServerContainerFixture() : base("tinkerpop/gremlin-server:3.7.2") { } - protected override async Task TransformQuerySource(IContainer container, IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g .UseGremlinServer(_ => _ .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri) .UseNewtonsoftJson()) diff --git a/test/Tests.Fixtures/GremlinServerFixture.cs b/test/Tests.Fixtures/GremlinServerFixture.cs index 5c599ef26..039669d2c 100644 --- a/test/Tests.Fixtures/GremlinServerFixture.cs +++ b/test/Tests.Fixtures/GremlinServerFixture.cs @@ -9,7 +9,7 @@ namespace ExRam.Gremlinq.Tests.Fixtures { public class GremlinServerFixture : GremlinqFixture { - protected override async Task TransformQuerySource(IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g .UseGremlinServer(_ => _ .AtLocalhost() .UseNewtonsoftJson()) diff --git a/test/Tests.Fixtures/GremlinServerWithoutProjectionContainerFixture.cs b/test/Tests.Fixtures/GremlinServerWithoutProjectionContainerFixture.cs index 52ab7148b..2f812ebb3 100644 --- a/test/Tests.Fixtures/GremlinServerWithoutProjectionContainerFixture.cs +++ b/test/Tests.Fixtures/GremlinServerWithoutProjectionContainerFixture.cs @@ -13,7 +13,7 @@ public GremlinServerWithoutProjectionContainerFixture() : base("tinkerpop/gremli { } - protected override async Task TransformQuerySource(IContainer container, IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g .UseGremlinServer(_ => _ .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri) .UseNewtonsoftJson()) diff --git a/test/Tests.Fixtures/GroovyGremlinQuerySerializationFixture.cs b/test/Tests.Fixtures/GroovyGremlinQuerySerializationFixture.cs index d86d36153..541875df7 100644 --- a/test/Tests.Fixtures/GroovyGremlinQuerySerializationFixture.cs +++ b/test/Tests.Fixtures/GroovyGremlinQuerySerializationFixture.cs @@ -10,7 +10,7 @@ namespace ExRam.Gremlinq.Tests.Fixtures { public class GroovyGremlinQuerySerializationFixture : GremlinqFixture { - protected override async Task TransformQuerySource(IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g .ConfigureEnvironment(env => env .ConfigureSerializer(ser => ser .Add(ConverterFactory diff --git a/test/Tests.Fixtures/JanusGraphContainerFixture.cs b/test/Tests.Fixtures/JanusGraphContainerFixture.cs index 9f0cd54d5..9bce719d2 100644 --- a/test/Tests.Fixtures/JanusGraphContainerFixture.cs +++ b/test/Tests.Fixtures/JanusGraphContainerFixture.cs @@ -15,7 +15,7 @@ public JanusGraphContainerFixture() : base("janusgraph/janusgraph:1.0.0") } - protected override async Task TransformQuerySource(IContainer container, IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g .UseJanusGraph(builder => builder .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri) .UseNewtonsoftJson()) diff --git a/test/Tests.Fixtures/JanusGraphFixture.cs b/test/Tests.Fixtures/JanusGraphFixture.cs index 584f96328..bfe762108 100644 --- a/test/Tests.Fixtures/JanusGraphFixture.cs +++ b/test/Tests.Fixtures/JanusGraphFixture.cs @@ -9,7 +9,7 @@ namespace ExRam.Gremlinq.Tests.Fixtures { public class JanusGraphFixture : GremlinqFixture { - protected override async Task TransformQuerySource(IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g .UseJanusGraph(builder => builder .AtLocalhost() .UseNewtonsoftJson()) diff --git a/test/Tests.Fixtures/NeptuneContainerFixture.cs b/test/Tests.Fixtures/NeptuneContainerFixture.cs index 245043346..363ecd933 100644 --- a/test/Tests.Fixtures/NeptuneContainerFixture.cs +++ b/test/Tests.Fixtures/NeptuneContainerFixture.cs @@ -13,7 +13,7 @@ public NeptuneContainerFixture() : base("tinkerpop/gremlin-server:3.7.2") { } - protected override async Task TransformQuerySource(IContainer container, IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g .UseNeptune(_ => _ .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri) .UseNewtonsoftJson()) diff --git a/test/Tests.Fixtures/NeptuneFixture.cs b/test/Tests.Fixtures/NeptuneFixture.cs index e22900860..c8b1536e8 100644 --- a/test/Tests.Fixtures/NeptuneFixture.cs +++ b/test/Tests.Fixtures/NeptuneFixture.cs @@ -9,7 +9,7 @@ namespace ExRam.Gremlinq.Tests.Fixtures { public class NeptuneFixture : GremlinqFixture { - protected override async Task TransformQuerySource(IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g .UseNeptune(_ => _ .AtLocalhost() .UseNewtonsoftJson()) diff --git a/test/Tests.Fixtures/PasswordSecuredGremlinServerContainerFixture.cs b/test/Tests.Fixtures/PasswordSecuredGremlinServerContainerFixture.cs index fc4a0bd12..cc1c70407 100644 --- a/test/Tests.Fixtures/PasswordSecuredGremlinServerContainerFixture.cs +++ b/test/Tests.Fixtures/PasswordSecuredGremlinServerContainerFixture.cs @@ -13,7 +13,7 @@ public PasswordSecuredGremlinServerContainerFixture() : base("PasswordSecureGrem { } - protected override async Task TransformQuerySource(IContainer container, IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g) => g .UseGremlinServer(_ => _ .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri) .ConfigureClientFactory(factory => factory diff --git a/test/Tests.Fixtures/RequestMessageWithAliasGremlinServerFixture.cs b/test/Tests.Fixtures/RequestMessageWithAliasGremlinServerFixture.cs index 558ef823e..960e2d7e2 100644 --- a/test/Tests.Fixtures/RequestMessageWithAliasGremlinServerFixture.cs +++ b/test/Tests.Fixtures/RequestMessageWithAliasGremlinServerFixture.cs @@ -8,7 +8,7 @@ namespace ExRam.Gremlinq.Providers.GremlinServer.Tests { public class RequestMessageWithAliasGremlinServerFixture : GremlinqFixture { - protected override async Task TransformQuerySource(IGremlinQuerySource g) => g + protected override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g .UseGremlinServer(builder => builder .AtLocalhost()) .ConfigureEnvironment(env => env diff --git a/test/Tests.Fixtures/TestContainerFixture.cs b/test/Tests.Fixtures/TestContainerFixture.cs index f961be3c6..c41ea2983 100644 --- a/test/Tests.Fixtures/TestContainerFixture.cs +++ b/test/Tests.Fixtures/TestContainerFixture.cs @@ -115,10 +115,10 @@ protected TestContainerFixtureBase(int port = 8182) _port = port; } - protected sealed override async Task TransformQuerySource(IGremlinQuerySource g) + protected sealed override IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) { if (_container is { } container) - return await TransformQuerySource(_container, new ContainerAttachedGremlinQuerySource(container, g)); + return TransformQuerySource(_container, new ContainerAttachedGremlinQuerySource(container, g)); throw new InvalidOperationException(); } @@ -168,6 +168,6 @@ public override async Task DisposeAsync() protected virtual ContainerBuilder CustomizeContainer(ContainerBuilder builder) => builder; - protected abstract Task TransformQuerySource(IContainer container, IGremlinQuerySource g); + protected abstract IGremlinQuerySource TransformQuerySource(IContainer container, IGremlinQuerySource g); } } diff --git a/test/Tests.Infrastructure/GremlinqFixture.cs b/test/Tests.Infrastructure/GremlinqFixture.cs index 944fa3565..88bf3f789 100644 --- a/test/Tests.Infrastructure/GremlinqFixture.cs +++ b/test/Tests.Infrastructure/GremlinqFixture.cs @@ -11,11 +11,11 @@ public class GremlinqFixture : IAsyncLifetime { private IGremlinQuerySource? _g; - protected virtual async Task TransformQuerySource(IGremlinQuerySource g) => g; + protected virtual IGremlinQuerySource TransformQuerySource(IGremlinQuerySource g) => g; public virtual async Task InitializeAsync() { - _g = await TransformQuerySource(g + _g = TransformQuerySource(g .ConfigureEnvironment(env => env .UseModel(GraphModel.FromBaseTypes()) .AddGraphSonBinarySupport()));