You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/12/02 11:33:03 UTC
[43/50] tinkerpop git commit: TINKERPOP-1562 Hook up Console to do
core imports under v3d3
TINKERPOP-1562 Hook up Console to do core imports under v3d3
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/83689211
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/83689211
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/83689211
Branch: refs/heads/TINKERPOP-1562
Commit: 83689211d05905fb4fd31375a8db225200a72ae5
Parents: 6d1b97e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Nov 30 07:28:37 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Dec 2 06:31:50 2016 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/console/Console.groovy | 21 +++++++++++++-------
.../ConsoleImportCustomizerProvider.groovy | 2 ++
2 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/83689211/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index d39e085..a2e518c 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -31,6 +31,8 @@ import org.apache.tinkerpop.gremlin.console.commands.UninstallCommand
import org.apache.tinkerpop.gremlin.console.plugin.PluggedIn
import org.apache.tinkerpop.gremlin.groovy.loaders.GremlinLoader
import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
+import org.apache.tinkerpop.gremlin.jsr223.CoreGremlinPlugin
+import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalExplanation
import org.apache.tinkerpop.gremlin.structure.Edge
import org.apache.tinkerpop.gremlin.structure.T
@@ -103,13 +105,18 @@ class Console {
// hide output temporarily while imports execute
showShellEvaluationOutput(false)
- // TODO: register CoreGremlinPlugin if using v3d3
-
- // add the default imports
- new ConsoleImportCustomizerProvider().getCombinedImports().stream()
- .collect { IMPORT_SPACE + it }.each { groovy.execute(it) }
- new ConsoleImportCustomizerProvider().getCombinedStaticImports().stream()
- .collect { IMPORT_STATIC_SPACE + it }.each { groovy.execute(it) }
+ if (Mediator.useV3d3) {
+ def imports = (ImportCustomizer) CoreGremlinPlugin.instance().getCustomizers("gremlin-groovy").get()[0]
+ imports.classImports.collect { IMPORT_SPACE + it.canonicalName }.each { groovy.execute(it) }
+ imports.methodImports.collect { IMPORT_STATIC_SPACE + it.getDeclaringClass().getCanonicalName() + "." + it.name}.each{ groovy.execute(it) }
+ imports.enumImports.collect { IMPORT_STATIC_SPACE + it.getDeclaringClass().getCanonicalName() + "." + it.name()}.each{ groovy.execute(it) }
+ } else {
+ // add the default imports
+ new ConsoleImportCustomizerProvider().getCombinedImports().stream()
+ .collect { IMPORT_SPACE + it }.each { groovy.execute(it) }
+ new ConsoleImportCustomizerProvider().getCombinedStaticImports().stream()
+ .collect { IMPORT_STATIC_SPACE + it }.each { groovy.execute(it) }
+ }
final InteractiveShellRunner runner = new InteractiveShellRunner(groovy, handlePrompt)
runner.setErrorHandler(handleError)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/83689211/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy
index 0404e93..85fda8c 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/ConsoleImportCustomizerProvider.groovy
@@ -23,7 +23,9 @@ import groovy.sql.Sql
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
+ * @deprecated As of release 3.2.4, not replaced.
*/
+@Deprecated
class ConsoleImportCustomizerProvider extends AbstractImportCustomizerProvider {
public ConsoleImportCustomizerProvider() {
// useful groovy bits that are good for the Console