Allow null values in bindings.

Gremlinq · Aug 17, 2024 · b7331c7 · b7331c7
1 parent 4e468d0
commit b7331c7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/Core/SerializedQueries/GroovyGremlinScript.cs b/src/Core/SerializedQueries/GroovyGremlinScript.cs
@@ -7,14 +7,14 @@ namespace ExRam.Gremlinq.Core.Serialization
     public readonly struct GroovyGremlinScript
     {
         private readonly string? _script;
-        private readonly ImmutableDictionary<string, object>? _bindings;
+        private readonly ImmutableDictionary<string, object?>? _bindings;
 
         [Obsolete($"Use {nameof(GroovyGremlinScript)}({nameof(String)}, {nameof(ImmutableDictionary<string, object>)}) constructor instead.")]
-        public GroovyGremlinScript(string script, IReadOnlyDictionary<string, object> bindings) : this(script, bindings.ToImmutableDictionary())
+        public GroovyGremlinScript(string script, IReadOnlyDictionary<string, object?> bindings) : this(script, bindings.ToImmutableDictionary())
         {
         }
 
-        public GroovyGremlinScript(string script, ImmutableDictionary<string, object> bindings)
+        public GroovyGremlinScript(string script, ImmutableDictionary<string, object?> bindings)
         {
             _script = script;
             _bindings = bindings;
@@ -24,6 +24,6 @@ public GroovyGremlinScript(string script, ImmutableDictionary<string, object> bi
 
         public string Script => _script ?? throw UninitializedStruct();
 
-        public ImmutableDictionary<string, object> Bindings => _bindings ?? throw UninitializedStruct();
+        public ImmutableDictionary<string, object?> Bindings => _bindings ?? throw UninitializedStruct();
     }
 }
diff --git a/src/Core/SerializedQueries/GroovyWriter.cs b/src/Core/SerializedQueries/GroovyWriter.cs
@@ -43,8 +43,8 @@ public static GroovyGremlinScript ToGroovyScript(Bytecode bytecode, IGremlinQuer
             return new GroovyGremlinScript(
                 stringBuilder.ToString(),
                 includeBindings
-                    ? bindings.ToImmutableDictionary(static kvp => (string)kvp.Value, static kvp => kvp.Key)
-                    : ImmutableDictionary<string, object>.Empty);
+                    ? bindings.ToImmutableDictionary(static kvp => (string)kvp.Value, static kvp => (object?)kvp.Key)
+                    : ImmutableDictionary<string, object?>.Empty);
         }
 
         private GroovyWriter Append(

diff --git a/src/Providers.Core/Extensions/RequestMessageExtensions.cs b/src/Providers.Core/Extensions/RequestMessageExtensions.cs
@@ -24,9 +24,9 @@ internal static class RequestMessageExtensions
                 {
                     return new GroovyGremlinScript(
                         script,
-                        includeBindings && requestMessage.Arguments.TryGetValue(Tokens.ArgsBindings, out var bindingsObject) && bindingsObject is IReadOnlyDictionary<string, object> bindings
+                        includeBindings && requestMessage.Arguments.TryGetValue(Tokens.ArgsBindings, out var bindingsObject) && bindingsObject is IReadOnlyDictionary<string, object?> bindings
                             ? bindings.ToImmutableDictionary()
-                            : ImmutableDictionary<string, object>.Empty);
+                            : ImmutableDictionary<string, object?>.Empty);
                 }
             }
 

diff --git a/test/PublicApi.Tests/PublicApiTests.Core.DotNet6_0.verified.cs b/test/PublicApi.Tests/PublicApiTests.Core.DotNet6_0.verified.cs
@@ -1576,9 +1576,9 @@ public static ExRam.Gremlinq.Core.Serialization.GroovyExpression From(string ide
     public readonly struct GroovyGremlinScript
     {
         [System.Obsolete("Use GroovyGremlinScript(String, ImmutableDictionary) constructor instead.")]
-        public GroovyGremlinScript(string script, System.Collections.Generic.IReadOnlyDictionary<string, object> bindings) { }
-        public GroovyGremlinScript(string script, System.Collections.Immutable.ImmutableDictionary<string, object> bindings) { }
-        public System.Collections.Immutable.ImmutableDictionary<string, object> Bindings { get; }
+        public GroovyGremlinScript(string script, System.Collections.Generic.IReadOnlyDictionary<string, object?> bindings) { }
+        public GroovyGremlinScript(string script, System.Collections.Immutable.ImmutableDictionary<string, object?> bindings) { }
+        public System.Collections.Immutable.ImmutableDictionary<string, object?> Bindings { get; }
         public string Script { get; }
         public override string ToString() { }
     }

diff --git a/test/PublicApi.Tests/PublicApiTests.Core.DotNet7_0.verified.cs b/test/PublicApi.Tests/PublicApiTests.Core.DotNet7_0.verified.cs
@@ -1576,9 +1576,9 @@ public static ExRam.Gremlinq.Core.Serialization.GroovyExpression From(string ide
     public readonly struct GroovyGremlinScript
     {
         [System.Obsolete("Use GroovyGremlinScript(String, ImmutableDictionary) constructor instead.")]
-        public GroovyGremlinScript(string script, System.Collections.Generic.IReadOnlyDictionary<string, object> bindings) { }
-        public GroovyGremlinScript(string script, System.Collections.Immutable.ImmutableDictionary<string, object> bindings) { }
-        public System.Collections.Immutable.ImmutableDictionary<string, object> Bindings { get; }
+        public GroovyGremlinScript(string script, System.Collections.Generic.IReadOnlyDictionary<string, object?> bindings) { }
+        public GroovyGremlinScript(string script, System.Collections.Immutable.ImmutableDictionary<string, object?> bindings) { }
+        public System.Collections.Immutable.ImmutableDictionary<string, object?> Bindings { get; }
         public string Script { get; }
         public override string ToString() { }
     }

diff --git a/test/PublicApi.Tests/PublicApiTests.Core.DotNet8_0.verified.cs b/test/PublicApi.Tests/PublicApiTests.Core.DotNet8_0.verified.cs
@@ -1576,9 +1576,9 @@ public static ExRam.Gremlinq.Core.Serialization.GroovyExpression From(string ide
     public readonly struct GroovyGremlinScript
     {
         [System.Obsolete("Use GroovyGremlinScript(String, ImmutableDictionary) constructor instead.")]
-        public GroovyGremlinScript(string script, System.Collections.Generic.IReadOnlyDictionary<string, object> bindings) { }
-        public GroovyGremlinScript(string script, System.Collections.Immutable.ImmutableDictionary<string, object> bindings) { }
-        public System.Collections.Immutable.ImmutableDictionary<string, object> Bindings { get; }
+        public GroovyGremlinScript(string script, System.Collections.Generic.IReadOnlyDictionary<string, object?> bindings) { }
+        public GroovyGremlinScript(string script, System.Collections.Immutable.ImmutableDictionary<string, object?> bindings) { }
+        public System.Collections.Immutable.ImmutableDictionary<string, object?> Bindings { get; }
         public string Script { get; }
         public override string ToString() { }
     }