From 812bc1de7888cc9f8ade71121d0bb605299fb8b6 Mon Sep 17 00:00:00 2001 From: Norio Akagi Date: Wed, 17 Jul 2024 10:06:30 -0700 Subject: [PATCH] Add getter for private fields to Concat, Conjoin, SplitGlobal/Local Step (#2687) --- CHANGELOG.asciidoc | 1 + .../gremlin/process/traversal/step/map/ConcatStep.java | 8 ++++++++ .../gremlin/process/traversal/step/map/ConjoinStep.java | 4 ++++ .../process/traversal/step/map/SplitGlobalStep.java | 4 ++++ .../process/traversal/step/map/SplitLocalStep.java | 4 ++++ 5 files changed, 21 insertions(+) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 629d5f61095..56712a17c43 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -34,6 +34,7 @@ This release also includes changes from <>. * Fixed so that `TrimGlobalStep` and `TrimLocalStep` have the same character control handling as `Ltrim` and `Rtrim` * Fix a bug in `MaxLocalStep`, `MinLocalStep`, `MeanLocalStep` and `SumLocalStep` that it throws `NoSuchElementException` when encounters an empty iterator as input. * Fix cases where Map keys of incomparable types could panic in `gremlin-go`. +* Added getter method to `ConcatStep`, `ConjoinStep`, `SplitGlobalStep` and `SplitLocalStep` for their private fields. [[release-3-7-2]] === TinkerPop 3.7.2 (April 8, 2024) diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStep.java index 04811d823ba..86d737f0220 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConcatStep.java @@ -120,6 +120,14 @@ private String processStrings(final String[] concatStrings) { return this.isNullString? null : sb.toString(); } + public List getConcatStrings() { + return this.concatStrings; + } + + public String getStringArgsResult() { + return this.stringArgsResult; + } + @Override public Set getRequirements() { return this.getSelfAndChildRequirements(TraverserRequirement.OBJECT); diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java index 0f38739f9bd..ce6818b4739 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ConjoinStep.java @@ -66,6 +66,10 @@ protected String map(Traverser.Admin traverser) { } } + public String getDelimiter() { + return this.delimiter; + } + @Override public Set getRequirements() { return Collections.singleton(TraverserRequirement.OBJECT); } diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStep.java index 2465e721018..14e886edfed 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitGlobalStep.java @@ -60,6 +60,10 @@ protected E map(final Traverser.Admin traverser) { return null == item? null : (E) Arrays.asList(StringUtils.splitByWholeSeparator((String) item, this.separator)); } + public String getSeparator() { + return this.separator; + } + @Override public Set getRequirements() { return Collections.singleton(TraverserRequirement.OBJECT); diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStep.java index 61a9901a84d..5d638c74ca6 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SplitLocalStep.java @@ -56,6 +56,10 @@ protected E applyStringOperation(String item) { @Override public String getStepName() { return "split(local)"; } + public String getSeparator() { + return this.separator; + } + @Override public int hashCode() { int result = super.hashCode();