tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject tinkerpop git commit: TINKERPOP-1706 Removed old GremlinJythonScriptEngine constructor.
Date Wed, 05 Jul 2017 20:32:07 GMT
Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1706 83a57b1a8 -> 46745e913


TINKERPOP-1706 Removed old GremlinJythonScriptEngine constructor.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46745e91
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46745e91
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46745e91

Branch: refs/heads/TINKERPOP-1706
Commit: 46745e9132050645aa76c46205058b0ba3997bd1
Parents: 83a57b1
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Wed Jul 5 16:31:34 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Wed Jul 5 16:31:34 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 docs/src/upgrade/release-3.3.x.asciidoc         |  2 ++
 .../jsr223/GremlinJythonScriptEngine.java       | 28 --------------------
 3 files changed, 3 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46745e91/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index bcb8875..94499e3 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 * Removed previously deprecated `TraversalScriptHelper` class.
 * Removed previously deprecated `ScriptEngineCache` class.
 * Removed previously deprecated `CoreImports` class.
+* Removed previously deprecated `GremlinJythonScriptEngine#()` constructor.
 * Removed access to previously deprecated `CoreGremlinPlugin#INSTANCE` field.
 * `gremlin.sh` and `gremln.bat` no longer support the option to pass a script as an argument
for execution mode without using the `-i` option.
 * Graphite and Ganglia are no longer packaged with the Gremlin Server distribution.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46745e91/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index f9d61a9..293b525 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -254,6 +254,8 @@ The following deprecated classes, methods or fields have been removed
in this ve
 ** `org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.*`
 ** `org.apache.tinkerpop.gremlin.groovy.util.DependencyGrabber#deleteDependenciesFromPath(org.apache.tinkerpop.gremlin.groovy.plugin.Artifact)`
 ** `org.apache.tinkerpop.gremlin.groovy.util.DependencyGrabber#copyDependenciesToPath(org.apache.tinkerpop.gremlin.groovy.plugin.Artifact)`
+* `gremlin-python`
+** `org.apache.tinkerpop.gremlin.python.jsr223.GremlinJythonScriptEngine#()`
 * `gremlin-server`
 ** `org.apache.tinkerpop.gremlin.server.Settings#plugins`
 ** `org.apache.tinkerpop.gremlin.server.auth.AllowAllAuthenticator.newSaslNegotiator()`

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46745e91/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
index f6ada6e..a58b82f 100644
--- a/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
+++ b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
@@ -50,34 +50,6 @@ public class GremlinJythonScriptEngine implements GremlinScriptEngine {
 
     private final PyScriptEngine pyScriptEngine;
 
-    /**
-     * @deprecated As of release 3.2.4, replaced by {@link #GremlinJythonScriptEngine(Customizer...)}.
-     */
-    @Deprecated
-    public GremlinJythonScriptEngine() {
-        this.pyScriptEngine = (PyScriptEngine) new PyScriptEngineFactory().getScriptEngine();
-        try {
-            // CoreImports
-            for (final Class x : CoreImports.getClassImports()) {
-                if (null == x.getDeclaringClass())
-                    this.pyScriptEngine.eval("from " + x.getPackage().getName() + " import
" + x.getSimpleName());
-                else
-                    this.pyScriptEngine.eval("from " + x.getPackage().getName() + "." + x.getDeclaringClass().getSimpleName()
+ " import " + x.getSimpleName());
-            }
-            for (final Method x : CoreImports.getMethodImports()) {
-                this.pyScriptEngine.eval(SymbolHelper.toPython(x.getName()) + " = " + x.getDeclaringClass().getSimpleName()
+ "." + x.getName());
-            }
-            for (final Enum x : CoreImports.getEnumImports()) {
-                this.pyScriptEngine.eval(SymbolHelper.toPython(x.name()) + " = " + x.getDeclaringClass().getSimpleName()
+ "." + x.name());
-            }
-
-            loadSugar();
-
-        } catch (final ScriptException e) {
-            throw new IllegalStateException(e.getMessage(), e);
-        }
-    }
-
     public GremlinJythonScriptEngine(final Customizer... customizers) {
         this.pyScriptEngine = (PyScriptEngine) new PyScriptEngineFactory().getScriptEngine();
         final List<Customizer> listOfCustomizers = new ArrayList<>(Arrays.asList(customizers));


Mime
View raw message