Merge branch '3.8-dev'

Author: spmallette

CHANGELOG.asciidoc

@@ -113,6 +113,7 @@ This release also includes changes from <<release-3-7-XXX, 3.7.XXX>>.
 * Updated `OptionsStrategy` in `gremlin-python` to take options directly as keyword arguments.
 * Added static `instance()` method to `ElementIdStrategy` to an instance with the default configuration.
 * Updated `ElementIdStrategy.getConfiguration()` to help with serialization.
+* Changed type for `ReservedKeysVerificationStrategy.keys` in .NET to take a `Set<string>` rather than `List<string>`.
 
 == TinkerPop 3.7.0 (Gremfir Master of the Pan Flute)
 

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/DotNetTranslateVisitor.java

@@ -280,16 +280,18 @@ public Void visitConfiguration(final GremlinParser.ConfigurationContext ctx) {
         sb.append(": ");
         visit(ctx.getChild(2));
 
-        // need to convert List to Set for readPartitions until TINKERPOP-3032
+        // need to convert List as needed to deal with fussy things in strategy construction inconsistencies
+        // TINKERPOP-3032/TINKERPOP-3055 - so messy
         if (ctx.getChild(0).getText().equals("readPartitions")) {
             // find the last "List" in sb and replace it with "HashSet"
             final int ix = sb.lastIndexOf("List<object>");
             sb.replace(ix, ix + 12, "HashSet<string>");
         } else if (ctx.getChild(0).getText().equals("keys")) {
-            // find the last "List" in sb and replace it with "HashSet"
-            final int ix = sb.lastIndexOf("List<object>");
+            // find the last "HashSet<object>" in sb and replace it with "HashSet<object>" so that it aligns to
+            // the type needed for keys -
+            final int ix = sb.lastIndexOf("HashSet<object>");
             if (ix > -1)
-                sb.replace(ix, ix + 12, "List<string>");
+                sb.replace(ix, ix + 15, "HashSet<string>");
         }
 
         return null;

gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java

@@ -583,10 +583,10 @@ public static Collection<Object[]> data() {
                             null,
                             null,
                             "g.with_bulk(x)"},
-                    {"g.withStrategies(ReservedKeysVerificationStrategy(keys:{'x','y'}))", /// if you happen to do [] you get a List in translation...........
+                    {"g.withStrategies(ReservedKeysVerificationStrategy(keys:{'x','y'}))", /// if you happen to do [] you get a List in translation...........TINKERPOP-3055
                             "g.withStrategies(ReservedKeysVerificationStrategy(keys:{'x', 'y'}))",
                             "g.withStrategies(ReservedKeysVerificationStrategy(keys:set0))",
-                            "g.WithStrategies(new ReservedKeysVerificationStrategy(keys: new HashSet<object> { \"x\", \"y\" }))",
+                            "g.WithStrategies(new ReservedKeysVerificationStrategy(keys: new HashSet<string> { \"x\", \"y\" }))",
                             "g.WithStrategies(gremlingo.ReservedKeysVerificationStrategy(gremlingo.ReservedKeysVerificationStrategyConfig{Keys: gremlingo.NewSimpleSet(\"x\", \"y\")}))",
                             "g.withStrategies(new ReservedKeysVerificationStrategy(keys:['x', 'y'] as Set))",
                             "g.withStrategies(ReservedKeysVerificationStrategy.build().keys(new HashSet<Object>() {{ add(\"x\"); add(\"y\"); }}).create())",

gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/ReservedKeysVerificationStrategy.cs

@@ -47,7 +47,7 @@ public ReservedKeysVerificationStrategy() : base(JavaFqcn)
         /// <param name="throwException">Throw an exception if a reserved key is used.</param>
         /// <param name="keys">List of keys to define as reserved. If not set then the defaults are used.</param>
         public ReservedKeysVerificationStrategy(bool logWarning = false, bool throwException = false,
-            List<string>? keys = null)
+            ISet<string>? keys = null)
             : this()
         {
             Configuration["logWarning"] = logWarning;

gremlin-python/src/main/python/radish/feature_steps.py

@@ -85,6 +85,7 @@ def choose_graph(step, graph_name):
     if not step.context.ignore:
         step.context.ignore = "AllowNullPropertyValues" in tagset
 
+    # TINKERPOP-3055
     if not step.context.ignore:
         step.context.ignore = "WithReservedKeysVerificationStrategy" in tagset
 
@@ -190,7 +191,7 @@ def raise_an_error(step):
 def raise_an_error_with_message(step, comparison, expected_message):
     if (step.context.ignore):
         return
-    
+
     assert_that(step.context.failed, equal_to(True))
 
     if comparison == "containing":