Merge branch '3.8-dev'

Author: Cole-Greer

CHANGELOG.asciidoc

@@ -151,12 +151,16 @@ This release also includes changes from <<release-3-7-XXX, 3.7.XXX>>.
 * Deprecated `ProcessLimitedStandardSuite` and `ProcessLimitedComputerSuite` in favor of `ProcessEmbeddedStandardSuite` and `ProcessEmbeddedComputerSuite` respectively.
 * Deprecated `ProcessStandardSuite` and the `ProcessComputerSuite` in favor of Gherkin testing and the `ProcessEmbeddedStandardSuite` and `ProcessEmbeddedComputerSuite` for testing JVM-specific Gremlin behaviors.
 * Removed lambda oriented Gremlin testing from Gherkin test suite.
+* Removed `P.getOriginalValue()` in favor of `P.getValue()`
 * Increase minimum Java version from 1.8 to 11 for building and running.
 * Moved all lambda oriented Gremlin tests to `LambdaStepTest` in the Java test suite.
 * Removed the `@RemoteOnly` testing tag in Gherkin as lambda tests have all been moved to the Java test suite.
 * Updated gremlin-javascript to use GraphBinary as default instead of GraphSONv3
 * Renamed many types in the grammar for consistent use of terms "Literal", "Argument", and "Varargs"
 * Changed `gremlin-net` so that System.Text.Json is only listed as an explicit dependency when it is not available from the framework.
+* Fixed translation of numeric literals for Go losing type definitions
+* Added `ParseBigInt()` in `gremlin-go` for parsing string into `big.Int`
+* Expanded gherkin syntax to directly configure traversal side effects in feature tests
 
 == TinkerPop 3.7.0 (Gremfir Master of the Pan Flute)
 

docs/src/dev/developer/for-committers.asciidoc

@@ -436,6 +436,18 @@ would be "1" and refer to the `Vertex` with that `id`.
 * `Predicate` variables should use `pred1`.
 * `Comparator` variables should use `c1` and `c2`.    
 
+Additionally, traversal side effects can be configured in a similar fashion as parameters. The structure for side effect
+definition looks like this:
+
+[source,gherkin]
+----
+Given the modern graph
+And using the side effect x defined as "v[marko].id"
+----
+
+The above example is equivalent to configuring a traversal with `g.withSideEffect(x, <marko vertex id>)` and may be
+used to add side effect values which could otherwise not be inlined into the traversal script.
+
 Finally, specify the traversal under test with the "Given" option "and the traversal":
 
 [source,gherkin]

docs/src/upgrade/release-3.8.x.asciidoc

@@ -196,6 +196,12 @@ See: link:https://issues.apache.org/jira/browse/TINKERPOP-3083[TINKERPOP-3083]
 Starting from this version, `gremlin-javascript` will deserialize `Set` data into a ECMAScript 2015 Set. Previously,
 these were deserialized into arrays.
 
+==== Removal of P.getOriginalValue()
+
+`P.getOriginalValue()` has been removed as it was not offering much value and was often confused with `P.getValue()`.
+Usage of `P.getOriginalValue()` often leads to unexpected results if called on a predicate which has had its value reset
+after construction. All usages of `P.getOriginalValue()` should be replaced with `P.getValue()`.
+
 ==== Gremlin Grammar Changes
 
 A number of changes have been introduced to the Gremlin grammar to help make it be more consistent and easier to use.
@@ -546,7 +552,7 @@ The `DiscardStep` is now renamed to `DiscardStep`. Providers who developed strat
 `DiscardStep` should switch to `DiscardStep`. Note that `DiscardStep` has been repurposed as `none(P)` for filtering
 collections as a complement to `any(P)` and `all(P)`.
 
-==== Set minimum Java version to 11
+===== Set minimum Java version to 11
 
 TinkerPop 3.8 requires a minimum of Java 11 for building and running. Support for Java 1.8 has been dropped.
 
@@ -567,6 +573,18 @@ link:https://tinkerpop.apache.org/docs/3.8.0/dev/provider/#gherkin-tests-suite[P
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-3136[TINKERPOP-3136]
 
+===== New Gherkin Syntax for Side Effects
+
+Added new syntax to the gherkin feature tests to directly add side effects to traversals.
+
+[source,gherkin]
+----
+Given the modern graph
+And using the side effect x defined as "v[marko].id"
+----
+
+Our complete Gherkin syntax for feature tests can be found in the link:https://tinkerpop.apache.org/docs/3.8.0/dev/developer/#_given[Developer Documentation].
+
 ===== Auto-promotion of Numbers
 
 Previously, operations like `sum` or `sack` that involved mathematical calculations did not automatically promote the
@@ -655,6 +673,12 @@ All the following types in the grammar have been renamed to follow consistent ru
 Additionally, `genericLiteralListArgument` and `stringLiteralList` have been removed in favor of `genericArgumentVarags`
 and `stringNullableLiteralVarargs` respectively.
 
+===== Removal of P.getOriginalValue()
+
+`P.getOriginalValue()` has been removed as it was not offering much value and was often confused with `P.getValue()`.
+Usage of `P.getOriginalValue()` often leads to unexpected results if called on a predicate which has had its value reset
+after construction. All usages of `P.getOriginalValue()` should be replaced with `P.getValue()`.
+
 ==== Graph Driver Providers
 
 ===== Prefer OffsetDateTime

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

@@ -88,11 +88,34 @@ public Void visitIntegerLiteral(final GremlinParser.IntegerLiteralContext ctx) {
         int lastCharIndex = integerLiteral.length() - 1;
         char lastChar = integerLiteral.charAt(lastCharIndex);
 
-        // if the last character is not alphabetic then try to interpret the right type and append the suffix
-        if (Character.isAlphabetic(lastChar))
+        // if the last character is alphabetic, then force the exact type
+        if (Character.isAlphabetic(lastChar)) {
+            switch(lastChar) {
+                case 'b':
+                    sb.append("int8(");
+                    break;
+                case 's':
+                    sb.append("int16(");
+                    break;
+                case 'i':
+                    sb.append("int32(");
+                    break;
+                case 'l':
+                    sb.append("int64(");
+                    break;
+                case 'n':
+                    sb.append("gremlingo.ParseBigInt(\"");
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unrecognized integer suffix: " + integerLiteral);
+            }
             sb.append(integerLiteral, 0, lastCharIndex);
-        else
+            if (lastChar == 'n') sb.append("\"");
+            sb.append(")");
+        }
+        else {
             sb.append(integerLiteral);
+        }
         return null;
     }
 
@@ -107,11 +130,28 @@ public Void visitFloatLiteral(final GremlinParser.FloatLiteralContext ctx) {
         int lastCharIndex = floatLiteral.length() - 1;
         char lastChar = floatLiteral.charAt(lastCharIndex);
 
-        // if the last character is not alphabetic then try to interpret the right type and append the suffix
-        if (Character.isAlphabetic(lastChar))
-            sb.append(floatLiteral, 0, lastCharIndex);
-        else
+        // if the last character is alphabetic, then force the exact type
+        if (Character.isAlphabetic(lastChar)) {
+            switch(lastChar) {
+                case 'f':
+                    sb.append("float32(");
+                    sb.append(floatLiteral, 0, lastCharIndex);
+                    sb.append(")");
+                    break;
+                case 'd': // Default case, no casts necessary
+                    sb.append(floatLiteral, 0, lastCharIndex);
+                    break;
+                case 'm':
+                    sb.append("gremlingo.ParseBigDecimal(\"");
+                    sb.append(floatLiteral, 0, lastCharIndex);
+                    sb.append("\")");
+                    break;
+                default:
+                    throw new IllegalArgumentException("Unrecognized float suffix: " + floatLiteral);
+            }
+        } else {
             sb.append(floatLiteral);
+        }
         return null;
     }
 

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/P.java

@@ -39,26 +39,16 @@ public class P<V> implements Predicate<V>, Serializable, Cloneable {
 
     protected PBiPredicate<V, V> biPredicate;
     protected V value;
-    protected V originalValue;
 
     public P(final PBiPredicate<V, V> biPredicate, final V value) {
         this.value = value;
-        this.originalValue = value;
         this.biPredicate = biPredicate;
     }
 
     public PBiPredicate<V, V> getBiPredicate() {
         return this.biPredicate;
     }
 
-    /**
-     * Gets the original value used at time of construction of the {@code P}. This value can change its type
-     * in some cases.
-     */
-    public V getOriginalValue() {
-        return originalValue;
-    }
-
     /*
      * Get the name of the predicate
      */
@@ -88,8 +78,8 @@ public boolean test(final V testValue) {
     @Override
     public int hashCode() {
         int result = this.biPredicate.hashCode();
-        if (null != this.originalValue)
-            result ^= this.originalValue.hashCode();
+        if (null != this.value)
+            result ^= this.value.hashCode();
         return result;
     }
 
@@ -98,17 +88,17 @@ public boolean equals(final Object other) {
         return other instanceof P &&
                 ((P) other).getClass().equals(this.getClass()) &&
                 ((P) other).getBiPredicate().equals(this.biPredicate) &&
-                ((((P) other).getOriginalValue() == null && this.originalValue == null) || ((P) other).getOriginalValue().equals(this.originalValue));
+                ((((P) other).getValue() == null && this.value == null) || ((P) other).getValue().equals(this.value));
     }
 
     @Override
     public String toString() {
-        return null == this.originalValue ? this.biPredicate.toString() : this.biPredicate.toString() + "(" + this.originalValue + ")";
+        return null == this.value ? this.biPredicate.toString() : this.biPredicate.toString() + "(" + this.value + ")";
     }
 
     @Override
     public P<V> negate() {
-        return new P<>(this.biPredicate.negate(), this.originalValue);
+        return new P<>(this.biPredicate.negate(), this.value);
     }
 
     @Override

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TextP.java

@@ -36,12 +36,12 @@ public boolean equals(final Object other) {
 
     @Override
     public String toString() {
-        return null == this.originalValue ? this.biPredicate.toString() : this.biPredicate.toString() + "(" + this.originalValue + ")";
+        return null == this.value ? this.biPredicate.toString() : this.biPredicate.toString() + "(" + this.value + ")";
     }
 
     @Override
     public TextP negate() {
-        return new TextP(this.biPredicate.negate(), this.originalValue);
+        return new TextP(this.biPredicate.negate(), this.value);
     }
 
     public TextP clone() {