Merge branch '3.6-dev' into 3.7-dev

CHANGELOG.asciidoc

@@ -298,6 +298,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Updated aliased client to pass along options via `with()` when submitting traversals.
 * Upgraded `gremlin-go` to Go 1.21.
 * Upgraded `gremlin-javascript` and `gremlint` to Node 18.17.0.
+* Allowed public access for `serviceName` and `mergedParams` in `CallStep`, and checks on `PartitionStrategy` usage in `MergeStep`.
 
 [[release-3-6-6]]
 === TinkerPop 3.6.6 (November 20, 2023)

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CallStep.java

@@ -98,6 +98,10 @@ protected Service<S, E> service() {
         return service != null ? service : (service = getServiceRegistry().get(serviceName, isStart, staticParams));
     }
 
+    public String getServiceName() {
+        return serviceName;
+    }
+
     @Override
     protected Traverser.Admin<E> processNextStart() {
         if (isStart && first) {
@@ -192,7 +196,7 @@ protected void closeIterator() {
         this.iterator = EmptyCloseableIterator.instance();
     }
 
-    protected Map getMergedParams() {
+    public Map getMergedParams() {
         if (mapTraversal == null && parameters.isEmpty()) {
             // static params only
             return Collections.unmodifiableMap(this.staticParams);

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeStep.java

@@ -70,7 +70,7 @@ public abstract class MergeStep<S, E, C> extends FlatMapStep<S, E>
 
     private Parameters parameters = new Parameters();
 
-    private boolean usesPartitionStrategy;
+    protected boolean usesPartitionStrategy;
 
     public MergeStep(final Traversal.Admin traversal, final boolean isStart) {
         this(traversal, isStart, new IdentityTraversal<>());
@@ -182,6 +182,10 @@ public Parameters getParameters() {
         return this.parameters;
     }
 
+    public boolean isUsingPartitionStrategy() {
+        return usesPartitionStrategy;
+    }
+
     @Override
     protected Traverser.Admin<E> processNextStart() {
         // when it's a start step a traverser needs to be created to kick off the traversal.