This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit a49bd2d53e34fa3e207af71102c3e9c1c7ebcc45 Author: Stephen Mallette <[email protected]> AuthorDate: Sat Mar 14 15:35:38 2026 -0400 Deprecated LANGUAGE translator for CANONICAL This naming is better aligned to javascript and more descriptive CTR --- CHANGELOG.asciidoc | 1 + .../apache/tinkerpop/gremlin/language/translator/Translator.java | 8 ++++++++ .../gremlin/language/translator/GremlinTranslatorTest.java | 8 ++++---- .../org/apache/tinkerpop/gremlin/features/StepDefinition.java | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 4ce833db65..e492c5e4bc 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -27,6 +27,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima This release also includes changes from <<release-3-7-6, 3.7.6>>. +* Deprecated `Translator.LANGUAGE` and preferred `Translator.CANONICAL`. * Preserved `BulkSet` when given to 'P'. * Fixed bug in Gremlin orderability semantics for `OffsetDateTime`. * Fixed bug in Javascript translation for UUID. diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/Translator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/Translator.java index d3eddbcffc..9f84ae2c1c 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/Translator.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/language/translator/Translator.java @@ -27,9 +27,17 @@ public enum Translator { /** * Translates to gremlin-language. + * + * @deprecated As of release 3.8.1, replaced by {@link Translator#CANONICAL}. */ + @Deprecated LANGUAGE("Language", TranslateVisitor::new), + /** + * Translates to gremlin-language, the canonical form of Gremlin. + */ + CANONICAL("Canonical", TranslateVisitor::new), + /** * Translates to gremlin-language with anonymized arguments. */ diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java index 26fefbc185..c0b13d66d4 100644 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/language/translator/GremlinTranslatorTest.java @@ -55,8 +55,8 @@ public class GremlinTranslatorTest { } @Test - public void shouldExtractVariablesFromLanguage() { - final Translation translation = GremlinTranslator.translate(query, Translator.LANGUAGE); + public void shouldExtractVariablesFromCanonical() { + final Translation translation = GremlinTranslator.translate(query, Translator.CANONICAL); assertEquals(expectedVariables.size(), translation.getParameters().size()); assertThat(translation.getParameters().toArray(), arrayContainingInAnyOrder(expectedVariables.toArray())); } @@ -1349,8 +1349,8 @@ public class GremlinTranslatorTest { } @Test - public void shouldTranslateForLang() { - final String translatedQuery = GremlinTranslator.translate(query, Translator.LANGUAGE).getTranslated(); + public void shouldTranslateForCanonical() { + final String translatedQuery = GremlinTranslator.translate(query, Translator.CANONICAL).getTranslated(); assertEquals(expectedForLang, translatedQuery); } diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java index db17603035..9707a473d8 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java @@ -589,7 +589,7 @@ public final class StepDefinition { private Traversal parseGremlin(final String script) { // tests the normalizer by running the script from the feature file first - final String normalizedGremlin = GremlinTranslator.translate(script, Translator.LANGUAGE).getTranslated(); + final String normalizedGremlin = GremlinTranslator.translate(script, Translator.CANONICAL).getTranslated(); // parse the Gremlin to a Traversal final GremlinLexer lexer = new GremlinLexer(CharStreams.fromString(normalizedGremlin));
