Review GroovyWriter

src/Core/SerializedQueries/GroovyWriter.cs

@@ -1,4 +1,7 @@
-using System.Collections.Immutable;
+#pragma warning disable IDE0003 // Remove qualification
+
+using System.Collections;
+using System.Collections.Immutable;
 using System.Text;
 
 using ExRam.Gremlinq.Core.Serialization;
@@ -45,7 +48,7 @@ public static GroovyGremlinScript ToGroovyScript(Bytecode bytecode, IGremlinQuer
         }
 
         private GroovyWriter Append(
-            object obj,
+            object? obj,
             StringBuilder stringBuilder,
             Dictionary<object, Label>? bindings,
             IGremlinQueryEnvironment environment,
@@ -85,7 +88,6 @@ private GroovyWriter Append(
                 }
                 case Instruction instruction:
                 {
-#pragma warning disable IDE0003 // Remove qualification
                     return this
                         .StartOperator(instruction.OperatorName, stringBuilder)
                         .Append(instruction.Arguments, stringBuilder, bindings, environment, true)
@@ -105,7 +107,6 @@ private GroovyWriter Append(
                         .StartOperator(operatorName, stringBuilder)
                         .Append(pValue, stringBuilder, bindings, environment, true)
                         .EndOperator(stringBuilder);
-#pragma warning restore IDE0003 // Remove qualification
                 }
                 case EnumWrapper t:
                 {
@@ -146,33 +147,22 @@ private GroovyWriter Append(
                         environment,
                         allowEnumerableExpansion);
                 }
-                case object[] objectArray when allowEnumerableExpansion:
-                {
-                    var writer = this;
-
-                    for (var i = 0; i < objectArray.Length; i++)
-                    {
-                        writer = writer
-                            .StartParameter(i, stringBuilder)
-                            .Append(objectArray[i], stringBuilder, bindings, environment);
-                    }
-
-                    return writer;
-                }
-                case object[] objectArray:
+                case IList list when !environment.SupportsTypeNatively(list.GetType()):
                 {
-                    var writer = this
-                        .StartArray(stringBuilder);
+                    var writer = allowEnumerableExpansion
+                        ? this
+                        : StartArray(stringBuilder);
 
-                    for (var i = 0; i < objectArray.Length; i++)
+                    for (var i = 0; i < list.Count; i++)
                     {
                         writer = writer
                             .StartElement(i, stringBuilder)
-                            .Append(objectArray[i], stringBuilder, bindings, environment);
+                            .Append(list[i], stringBuilder, bindings, environment);
                     }
 
-                    return writer
-                        .EndArray(stringBuilder);
+                    return allowEnumerableExpansion
+                        ? writer
+                        : writer.EndArray(stringBuilder);
                 }
                 case null:
                     return Write("null", stringBuilder);

test/Core.Tests/Debugging/DefaultDebugGremlinQuerySerializationTest.Constant_empty_bool_array.verified.txt

@@ -0,0 +1 @@
+g.V().constant([])

test/Core.Tests/Debugging/DefaultDebugGremlinQuerySerializationTest.Constant_single_bool_array.verified.txt

@@ -0,0 +1 @@
+g.V().constant([true])

test/Core.Tests/Debugging/DefaultDebugGremlinQuerySerializationTest.Constant_string.verified.txt

@@ -0,0 +1 @@
+g.V().constant('Hallo')

test/Core.Tests/Serialization/BytecodeQuerySerializationTest.Constant_empty_bool_array.verified.txt

@@ -0,0 +1,11 @@
+{
+  StepInstructions: [
+    {
+      OperatorName: V
+    },
+    {
+      OperatorName: constant,
+      Arguments: []
+    }
+  ]
+}

test/Core.Tests/Serialization/BytecodeQuerySerializationTest.Constant_single_bool_array.verified.txt

@@ -0,0 +1,15 @@
+{
+  StepInstructions: [
+    {
+      OperatorName: V
+    },
+    {
+      OperatorName: constant,
+      Arguments: [
+        [
+          true
+        ]
+      ]
+    }
+  ]
+}

test/Core.Tests/Serialization/BytecodeQuerySerializationTest.Constant_string.verified.txt

@@ -0,0 +1,13 @@
+{
+  StepInstructions: [
+    {
+      OperatorName: V
+    },
+    {
+      OperatorName: constant,
+      Arguments: [
+        Hallo
+      ]
+    }
+  ]
+}

test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.Constant_empty_bool_array.verified.txt

@@ -0,0 +1,11 @@
+{
+  StepInstructions: [
+    {
+      OperatorName: V
+    },
+    {
+      OperatorName: constant,
+      Arguments: []
+    }
+  ]
+}

test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.Constant_single_bool_array.verified.txt

@@ -0,0 +1,15 @@
+{
+  StepInstructions: [
+    {
+      OperatorName: V
+    },
+    {
+      OperatorName: constant,
+      Arguments: [
+        [
+          true
+        ]
+      ]
+    }
+  ]
+}

test/Core.Tests/Serialization/EmptyProjectionValueProtectionSerializationTest.Constant_string.verified.txt

@@ -0,0 +1,13 @@
+{
+  StepInstructions: [
+    {
+      OperatorName: V
+    },
+    {
+      OperatorName: constant,
+      Arguments: [
+        Hallo
+      ]
+    }
+  ]
+}

test/Core.Tests/Serialization/Graphson2GremlinQuerySerializationTest.Constant_empty_bool_array.verified.txt

@@ -0,0 +1,24 @@
+{
+  "requestId": "00000000-0000-0000-0000-000000000000",
+  "op": "bytecode",
+  "processor": "traversal",
+  "args": {
+    "gremlin": {
+      "@type": "g:Bytecode",
+      "@value": {
+        "step": [
+          [
+            "V"
+          ],
+          [
+            "constant",
+            []
+          ]
+        ]
+      }
+    },
+    "aliases": {
+      "g": "g"
+    }
+  }
+}

test/Core.Tests/Serialization/Graphson2GremlinQuerySerializationTest.Constant_single_bool_array.verified.txt

@@ -0,0 +1,26 @@
+{
+  "requestId": "00000000-0000-0000-0000-000000000000",
+  "op": "bytecode",
+  "processor": "traversal",
+  "args": {
+    "gremlin": {
+      "@type": "g:Bytecode",
+      "@value": {
+        "step": [
+          [
+            "V"
+          ],
+          [
+            "constant",
+            [
+              true
+            ]
+          ]
+        ]
+      }
+    },
+    "aliases": {
+      "g": "g"
+    }
+  }
+}

test/Core.Tests/Serialization/Graphson2GremlinQuerySerializationTest.Constant_string.verified.txt

@@ -0,0 +1,24 @@
+{
+  "requestId": "00000000-0000-0000-0000-000000000000",
+  "op": "bytecode",
+  "processor": "traversal",
+  "args": {
+    "gremlin": {
+      "@type": "g:Bytecode",
+      "@value": {
+        "step": [
+          [
+            "V"
+          ],
+          [
+            "constant",
+            "Hallo"
+          ]
+        ]
+      }
+    },
+    "aliases": {
+      "g": "g"
+    }
+  }
+}

test/Core.Tests/Serialization/Graphson3GremlinQuerySerializationTest.Constant_empty_bool_array.verified.txt

@@ -0,0 +1,24 @@
+{
+  "requestId": "00000000-0000-0000-0000-000000000000",
+  "op": "bytecode",
+  "processor": "traversal",
+  "args": {
+    "gremlin": {
+      "@type": "g:Bytecode",
+      "@value": {
+        "step": [
+          [
+            "V"
+          ],
+          [
+            "constant",
+            []
+          ]
+        ]
+      }
+    },
+    "aliases": {
+      "g": "g"
+    }
+  }
+}

test/Core.Tests/Serialization/Graphson3GremlinQuerySerializationTest.Constant_single_bool_array.verified.txt

@@ -0,0 +1,26 @@
+{
+  "requestId": "00000000-0000-0000-0000-000000000000",
+  "op": "bytecode",
+  "processor": "traversal",
+  "args": {
+    "gremlin": {
+      "@type": "g:Bytecode",
+      "@value": {
+        "step": [
+          [
+            "V"
+          ],
+          [
+            "constant",
+            [
+              true
+            ]
+          ]
+        ]
+      }
+    },
+    "aliases": {
+      "g": "g"
+    }
+  }
+}

test/Core.Tests/Serialization/Graphson3GremlinQuerySerializationTest.Constant_string.verified.txt

@@ -0,0 +1,24 @@
+{
+  "requestId": "00000000-0000-0000-0000-000000000000",
+  "op": "bytecode",
+  "processor": "traversal",
+  "args": {
+    "gremlin": {
+      "@type": "g:Bytecode",
+      "@value": {
+        "step": [
+          [
+            "V"
+          ],
+          [
+            "constant",
+            "Hallo"
+          ]
+        ]
+      }
+    },
+    "aliases": {
+      "g": "g"
+    }
+  }
+}

test/Core.Tests/Serialization/Graphson3WithGroovyGremlinQuerySerializationTest.Constant_empty_bool_array.verified.txt

@@ -0,0 +1,12 @@
+{
+  "requestId": "00000000-0000-0000-0000-000000000000",
+  "op": "eval",
+  "processor": "",
+  "args": {
+    "gremlin": "g.V().constant([])",
+    "bindings": {},
+    "aliases": {
+      "g": "g"
+    }
+  }
+}

test/Core.Tests/Serialization/Graphson3WithGroovyGremlinQuerySerializationTest.Constant_single_bool_array.verified.txt

@@ -0,0 +1,14 @@
+{
+  "requestId": "00000000-0000-0000-0000-000000000000",
+  "op": "eval",
+  "processor": "",
+  "args": {
+    "gremlin": "g.V().constant([_a])",
+    "bindings": {
+      "_a": true
+    },
+    "aliases": {
+      "g": "g"
+    }
+  }
+}

test/Core.Tests/Serialization/Graphson3WithGroovyGremlinQuerySerializationTest.Constant_string.verified.txt

@@ -0,0 +1,14 @@
+{
+  "requestId": "00000000-0000-0000-0000-000000000000",
+  "op": "eval",
+  "processor": "",
+  "args": {
+    "gremlin": "g.V().constant(_a)",
+    "bindings": {
+      "_a": "Hallo"
+    },
+    "aliases": {
+      "g": "g"
+    }
+  }
+}

test/Core.Tests/Serialization/GroovyGremlinQuerySerializationTest.Constant_empty_bool_array.verified.txt

@@ -0,0 +1,3 @@
+{
+  Script: g.V().constant([])
+}

test/Core.Tests/Serialization/GroovyGremlinQuerySerializationTest.Constant_single_bool_array.verified.txt

@@ -0,0 +1,6 @@
+{
+  Script: g.V().constant([_a]),
+  Bindings: {
+    _a: true
+  }
+}