Skip to content

TINKERPOP-1989 Enforce order of plugin load in Gremlin Console #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 1 commit into from
Jun 27, 2018
Merged

TINKERPOP-1989 Enforce order of plugin load in Gremlin Console #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Improved performance of `TraversalVertexProgram` and related infrastructure.
* Added `createGratefulDead()`to `TinkerFactory` to help make it easier to try to instantiate that toy graph.
* Added identifiers to edges in the Kitchen Sink toy graph.
* Ordered the loading of plugins in the Gremlin Console by their position in the configuration file.
* Refactored the Gremlin Server integration testing framework and streamlined that infrastructure.
* Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects.
* Added concrete configuration methods to `SparkGraphComputer` to make a more clear API for configuring it.
Expand Down
16 changes: 9 additions & 7 deletions gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class Console {

GremlinLoader.load()

// check for available plugins. if they are in the "active" plugins strategies then "activate" them
// check for available plugins on the path and track them by plugin class name
def activePlugins = Mediator.readPluginState()
def pluginClass = mediator.useV3d3 ? org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin : GremlinPlugin
ServiceLoader.load(pluginClass, groovy.getInterp().getClassLoader()).each { plugin ->
Expand All @@ -141,14 +141,16 @@ class Console {
}

mediator.availablePlugins.put(plugin.class.name, pluggedIn)
}
}

if (activePlugins.contains(plugin.class.name)) {
pluggedIn.activate()
// if there are active plugins then initialize them in the order that they are listed
activePlugins.each { pluginName ->
def pluggedIn = mediator.availablePlugins[pluginName]
pluggedIn.activate()

if (!io.quiet)
io.out.println(Colorizer.render(Preferences.infoColor, "plugin activated: " + plugin.getName()))
}
}
if (!io.quiet)
io.out.println(Colorizer.render(Preferences.infoColor, "plugin activated: " + pluggedIn.getPlugin().getName()))
}

// remove any "uninstalled" plugins from plugin state as it means they were installed, activated, but not
Expand Down