Convenience extension for builing serializers, renaming.

Gremlinq · Sep 20, 2019 · b9c7c03 · b9c7c03
1 parent 7c23ddd
commit b9c7c03
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/ExRam.Gremlinq.Core/ExecutionPipelines/GremlinQueryExecutionPipeline.cs b/ExRam.Gremlinq.Core/ExecutionPipelines/GremlinQueryExecutionPipeline.cs
@@ -67,6 +67,11 @@ public static IGremlinQueryExecutionPipeline UseSerializer(this IGremlinQueryExe
             return pipeline.ConfigureSerializer(_ => serializer);
         }
 
+        public static IGremlinQueryExecutionPipeline UseSerializer(this IGremlinQueryExecutionPipeline pipeline, Func<IGremlinQuerySerializerBuilder, IGremlinQuerySerializer> builder)
+        {
+            return pipeline.ConfigureSerializer(_ => builder(GremlinQuerySerializerBuilder.Invalid));
+        }
+
         public static IGremlinQueryExecutionPipeline UseDeserializer(this IGremlinQueryExecutionPipeline pipeline, IGremlinQueryExecutionResultDeserializer deserializer)
         {
             return pipeline.ConfigureDeserializer(_ => deserializer);

diff --git a/ExRam.Gremlinq.Core/ExecutionPipelines/GremlinQuerySerializer.cs b/ExRam.Gremlinq.Core/ExecutionPipelines/GremlinQuerySerializer.cs
@@ -28,8 +28,8 @@ public object Serialize(IGremlinQuery query)
 
         public static readonly IGremlinQuerySerializer Groovy = GremlinQuerySerializerBuilder
             .Invalid
-            .AddGremlinSteps()
-            .AddGroovy()
+            .UseDefaultGremlinStepSerializationHandlers()
+            .UseGroovy()
             .Build();
     }
 }
diff --git a/...Gremlinq.Core/ExecutionPipelines/SerializedQueryAssembly/GremlinQuerySerializerBuilder.cs b/...Gremlinq.Core/ExecutionPipelines/SerializedQueryAssembly/GremlinQuerySerializerBuilder.cs
@@ -94,13 +94,13 @@ public IGremlinQuerySerializer Build()
 
         public static readonly IGremlinQuerySerializerBuilder Invalid = new GremlinQuerySerializerBuilderImpl(ImmutableDictionary<Type, AtomSerializationHandler<object>>.Empty, SerializedGremlinQueryAssemblerFactory.Invalid);
 
-        public static IGremlinQuerySerializerBuilder AddGroovy(this IGremlinQuerySerializerBuilder builder)
+        public static IGremlinQuerySerializerBuilder UseGroovy(this IGremlinQuerySerializerBuilder builder)
         {
             return builder
                 .ConfigureAssemblerFactory(_ => SerializedGremlinQueryAssemblerFactory.Groovy);
         }
 
-        public static IGremlinQuerySerializerBuilder AddGremlinSteps(this IGremlinQuerySerializerBuilder builder)
+        public static IGremlinQuerySerializerBuilder UseDefaultGremlinStepSerializationHandlers(this IGremlinQuerySerializerBuilder builder)
         {
             return builder
                 .OverrideAtomSerializationHandler<HasNotStep>((step, assembler, overridden, recurse) => assembler.Method("hasNot", step.Key, recurse))

diff --git a/ExRam.Gremlinq.Providers.CosmosDb/GremlinQueryExecutionPipelinesExtensions.cs b/ExRam.Gremlinq.Providers.CosmosDb/GremlinQueryExecutionPipelinesExtensions.cs
@@ -57,10 +57,10 @@ public static IGremlinQueryExecutionPipeline UseCosmosDbDeserializer(this IGreml
         public static IGremlinQueryExecutionPipeline UseCosmosDbSerializer(this IGremlinQueryExecutionPipeline pipeline)
         {
             return pipeline
-                .UseSerializer(GremlinQuerySerializerBuilder.Invalid
-                    .AddGremlinSteps()
-                    .AddGroovy()
-                    .AddCosmosDbWorkarounds()
+                .UseSerializer(builder => builder
+                    .UseDefaultGremlinStepSerializationHandlers()
+                    .UseGroovy()
+                    .UseCosmosDbWorkarounds()
                     .Build());
         }
 

diff --git a/ExRam.Gremlinq.Providers.CosmosDb/GremlinQuerySerializerBuilderExtensions.cs b/ExRam.Gremlinq.Providers.CosmosDb/GremlinQuerySerializerBuilderExtensions.cs
@@ -6,7 +6,7 @@ public static class GremlinQuerySerializerBuilderExtensions
     {
         private static readonly Step NoneWorkaround = new NotStep(GremlinQuery.Anonymous(GremlinQueryEnvironment.Default).Identity());
 
-        public static IGremlinQuerySerializerBuilder AddCosmosDbWorkarounds(this IGremlinQuerySerializerBuilder builder)
+        public static IGremlinQuerySerializerBuilder UseCosmosDbWorkarounds(this IGremlinQuerySerializerBuilder builder)
         {
             return builder
                 .OverrideAtomSerializationHandler<SkipStep>((step, assembler, overridden, recurse) => recurse(new RangeStep(step.Count, -1)))