TINKERPOP-1562 Start getting Console working with new plugin stuff Built adapters to get new RemoteAcceptor to behave as the old RemoteAcceptor and to get new GremlinPlugin to work as the old GremlinPlugin. Deprecated some classes and undeprecated others - still a pretty big WIP commit at this point but nothing appears to be broken.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a28100fd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a28100fd Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a28100fd Branch: refs/heads/TINKERPOP-1562 Commit: a28100fd1d0adcb3837aed99a177a3191d54d7cd Parents: d09cf9c Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon Nov 21 17:15:53 2016 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Dec 1 06:41:42 2016 -0500 ---------------------------------------------------------------------- .../tinkerpop/gremlin/console/Console.groovy | 14 +- .../tinkerpop/gremlin/console/Mediator.groovy | 4 +- .../console/jsr223/GephiRemoteAcceptor.groovy | 372 ------------------- .../console/plugin/ConsolePluginAcceptor.groovy | 2 +- .../console/plugin/GephiRemoteAcceptor.groovy | 1 - .../gremlin/console/plugin/PluggedIn.groovy | 79 ++++ .../tinkerpop/gremlin/jsr223/Customizer.java | 4 +- .../tinkerpop/gremlin/jsr223/GremlinModule.java | 2 + .../tinkerpop/gremlin/jsr223/GremlinPlugin.java | 9 - .../gremlin/jsr223/GremlinPluginException.java | 41 ++ .../gremlin/jsr223/RemoteAcceptor.java | 81 ---- .../gremlin/jsr223/RemoteException.java | 40 -- .../jsr223/console/ConsoleCustomizer.java | 33 ++ .../gremlin/jsr223/console/PluginAcceptor.java | 62 ++++ .../gremlin/jsr223/console/RemoteAcceptor.java | 81 ++++ .../gremlin/jsr223/console/RemoteException.java | 40 ++ .../gremlin/groovy/plugin/GremlinPlugin.java | 1 + .../gremlin/groovy/plugin/PluginAcceptor.java | 2 + .../gremlin/groovy/plugin/RemoteAcceptor.java | 2 +- .../jsr223/GremlinEnabledScriptEngineTest.java | 1 + 20 files changed, 361 insertions(+), 510 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/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 69d6ba3..cb6e90f 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 @@ -103,6 +103,8 @@ 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) } @@ -123,9 +125,17 @@ class Console { // check for available plugins. if they are in the "active" plugins strategies then "activate" them def activePlugins = Mediator.readPluginState() - ServiceLoader.load(GremlinPlugin.class, groovy.getInterp().getClassLoader()).each { plugin -> + def pluginClass = mediator.useV3d3 ? org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin : GremlinPlugin + ServiceLoader.load(pluginClass, groovy.getInterp().getClassLoader()).each { plugin -> if (!mediator.availablePlugins.containsKey(plugin.class.name)) { - def pluggedIn = new PluggedIn(plugin, groovy, io, false) + def pluggedIn + + if (Mediator.useV3d3) { + pluggedIn = new PluggedIn(new PluggedIn.GremlinPluginAdapter(plugin), groovy, io, false) + } else { + pluggedIn = new PluggedIn(plugin, groovy, io, false) + } + mediator.availablePlugins.put(plugin.class.name, pluggedIn) if (activePlugins.contains(plugin.class.name)) { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy ---------------------------------------------------------------------- diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy index 047e3d7..396c563 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy @@ -21,8 +21,6 @@ package org.apache.tinkerpop.gremlin.console import org.apache.tinkerpop.gremlin.console.plugin.PluggedIn import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor -import java.util.concurrent.CompletableFuture - /** * @author Stephen Mallette (http://stephen.genoprime.com) */ @@ -36,6 +34,8 @@ class Mediator { private static String LINE_SEP = System.getProperty("line.separator") + public static final boolean useV3d3 = System.getProperty("plugins", "v3d3") == "v3d3" + public Mediator(final Console console) { this.console = console } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptor.groovy ---------------------------------------------------------------------- diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptor.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptor.groovy deleted file mode 100644 index 11e1e5c..0000000 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/jsr223/GephiRemoteAcceptor.groovy +++ /dev/null @@ -1,372 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tinkerpop.gremlin.console.jsr223 - -import groovy.json.JsonOutput -import groovy.json.JsonSlurper -import groovy.transform.CompileStatic -import org.apache.http.client.methods.CloseableHttpResponse -import org.apache.http.client.methods.HttpUriRequest -import org.apache.http.client.methods.RequestBuilder -import org.apache.http.entity.StringEntity -import org.apache.http.impl.client.CloseableHttpClient -import org.apache.http.impl.client.HttpClients -import org.apache.http.util.EntityUtils -import org.apache.tinkerpop.gremlin.console.plugin.GephiTraversalVisualizationStrategy -import org.apache.tinkerpop.gremlin.jsr223.RemoteAcceptor -import org.apache.tinkerpop.gremlin.jsr223.RemoteException -import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource -import org.apache.tinkerpop.gremlin.structure.Edge -import org.apache.tinkerpop.gremlin.structure.Graph -import org.apache.tinkerpop.gremlin.structure.Vertex -import org.codehaus.groovy.tools.shell.Groovysh -import org.codehaus.groovy.tools.shell.IO - -/** - * @author Stephen Mallette (http://stephen.genoprime.com) - * @author Randall Barnhart (rando...@gmail.com) - */ -class GephiRemoteAcceptor implements RemoteAcceptor { - - private String host = "localhost" - private int port = 8080 - private String workspace = "workspace1" - - private final Groovysh shell - private final IO io - - private final Random rand = new Random(); - boolean traversalSubmittedForViz = false - long vizStepDelay - private float[] vizStartRGBColor - private float[] vizDefaultRGBColor - private char vizColorToFade - private float vizColorFadeRate - private float vizStartSize - private float vizSizeDecrementRate - private Map vertexAttributes = [:] - - private CloseableHttpClient httpclient = HttpClients.createDefault(); - - public GephiRemoteAcceptor(final Groovysh shell, final IO io) { - this.shell = shell - this.io = io - - // traversal visualization defaults - vizStepDelay = 1000; // 1 second pause between viz of steps - vizStartRGBColor = [0.0f, 1.0f, 0.5f] // light aqua green - vizDefaultRGBColor = [0.6f, 0.6f, 0.6f] // light grey - vizColorToFade = 'g' // will fade so blue is strongest - vizColorFadeRate = 0.7 // the multiplicative rate to fade visited vertices - vizStartSize = 10 - vizSizeDecrementRate = 0.33f - } - - @Override - connect(final List<String> args) throws RemoteException { - if (args.size() >= 1) - workspace = args[0] - - if (args.size() >= 2) - host = args[1] - - if (args.size() >= 3) { - try { - port = Integer.parseInt(args[2]) - } catch (Exception ex) { - throw new RemoteException("Port must be an integer value") - } - } - - def vizConfig = " with stepDelay:$vizStepDelay, startRGBColor:$vizStartRGBColor, " + - "colorToFade:$vizColorToFade, colorFadeRate:$vizColorFadeRate, startSize:$vizStartSize," + - "sizeDecrementRate:$vizSizeDecrementRate" - - return "Connection to Gephi - http://$host:$port/$workspace"; + vizConfig - } - - @Override - Object configure(final List<String> args) throws RemoteException { - if (args.size() < 2) - throw new RemoteException("Invalid config arguments - check syntax") - - if (args[0] == "host") - host = args[1] - else if (args[0] == "port") { - try { - port = Integer.parseInt(args[1]) - } catch (Exception ignored) { - throw new RemoteException("Port must be an integer value") - } - } else if (args[0] == "workspace") - workspace = args[1] - else if (args[0] == "stepDelay") - parseVizStepDelay(args[1]) - else if (args[0] == "startRGBColor") - parseVizStartRGBColor(args[1]) - else if (args[0] == "colorToFade") - parseVizColorToFade(args[1]) - else if (args[0] == "colorFadeRate") - parseVizColorFadeRate(args[1]) - else if (args[0] == "sizeDecrementRate") - parseVizSizeDecrementRate(args[1]) - else if (args[0] == "startSize") - parseVizStartSize(args[1]) - else if (args[0] == "visualTraversal") { - def graphVar = shell.interp.context.getVariable(args[1]) - if (!(graphVar instanceof Graph)) - throw new RemoteException("Invalid argument to 'visualTraversal' - first parameter must be a Graph instance") - - def gVar = args.size() == 3 ? args[2] : "vg" - def theG = GraphTraversalSource.build().with(new GephiTraversalVisualizationStrategy(this)).create(graphVar) - shell.interp.context.setVariable(gVar, theG) - } else - throw new RemoteException("Invalid config arguments - check syntax") - - return "Connection to Gephi - http://$host:$port/$workspace"; + - " with stepDelay:$vizStepDelay, startRGBColor:$vizStartRGBColor, " + - "colorToFade:$vizColorToFade, colorFadeRate:$vizColorFadeRate, startSize:$vizStartSize," + - "sizeDecrementRate:$vizSizeDecrementRate" - } - - @Override - @CompileStatic - Object submit(final List<String> args) throws RemoteException { - final String line = String.join(" ", args) - if (line.trim() == "clear") { - clearGraph() - io.out.println("Gephi workspace cleared") - return - } - - // need to clear the vertex attributes - vertexAttributes.clear() - - // this tells the GraphTraversalVisualizationStrategy that if the line eval's to a traversal it should - // try to visualize it - traversalSubmittedForViz = true - - // get the colors/sizes back to basics before trying visualize - resetColorsSizes() - - final Object o = shell.execute(line) - if (o instanceof Graph) { - clearGraph() - def graph = (Graph) o - def g = graph.traversal() - g.V().sideEffect { addVertexToGephi(g, it.get()) }.iterate() - } - - traversalSubmittedForViz = false - } - - @Override - void close() throws IOException { - httpclient.close() - } - - /** - * Visits the last set of vertices traversed and degrades their color and size. - */ - def updateVisitedVertices(def List except = []) { - vertexAttributes.keySet().findAll{ vertexId -> !except.contains(vertexId) }.each { String vertexId -> - def attrs = vertexAttributes[vertexId] - float currentColor = attrs.color - currentColor *= vizColorFadeRate - - int currentSize = attrs["size"] - currentSize = Math.max(vizStartSize, currentSize - (currentSize * vizSizeDecrementRate)) - - vertexAttributes.get(vertexId).color = currentColor - vertexAttributes.get(vertexId).size = currentSize - - changeVertexAttributes(vertexId) - } - } - - def changeVertexAttributes(def String vertexId) { - def props = [:] - props.put(vizColorToFade.toString(), vertexAttributes[vertexId].color) - props.put("size", vertexAttributes[vertexId].size) - updateGephiGraph([cn: [(vertexId): props]]) - } - - /** - * Visit a vertex traversed and initialize its color and size. - */ - def visitVertexInGephi(def Vertex v) { - def props = [:] - props.put('r', vizStartRGBColor[0]) - props.put('g', vizStartRGBColor[1]) - props.put('b', vizStartRGBColor[2]) - props.put('size', vizStartSize * 2.5) - props.put('visited', 1) - - updateGephiGraph([cn: [(v.id().toString()): props]]) - - vertexAttributes[v.id().toString()] = [color: vizStartRGBColor[fadeColorIndex()], size: vizStartSize * 2.5, touch: 1] - } - - def fadeColorIndex() { - if (vizColorToFade == 'r') - return 0 - else if (vizColorToFade == 'g') - return 1 - else if (vizColorToFade == 'b') - return 2 - } - - def addVertexToGephi(def GraphTraversalSource g, def Vertex v, def boolean ignoreEdges = false) { - // grab the first property value from the strategies of values - def props = g.V(v).valueMap().next().collectEntries { kv -> [(kv.key): kv.value[0]] } - props << [label: v.label()] - props.put('r', vizDefaultRGBColor[0]) - props.put('g', vizDefaultRGBColor[1]) - props.put('b', vizDefaultRGBColor[2]) - props.put('x', rand.nextFloat()) - props.put('y', rand.nextFloat()) - props.put('size', 10) - props.put('visited', 0) - - // only add if it does not exist in graph already - if (!getFromGephiGraph([operation: "getNode", id: v.id().toString()]).isPresent()) - updateGephiGraph([an: [(v.id().toString()): props]]) - - if (!ignoreEdges) { - g.V(v).outE().sideEffect { - addEdgeToGephi(g, it.get()) - }.iterate() - } - } - - @CompileStatic - def addEdgeToGephi(def GraphTraversalSource g, def Edge e) { - def props = g.E(e).valueMap().next() - props.put('label', e.label()) - props.put('source', e.outVertex().id().toString()) - props.put('target', e.inVertex().id().toString()) - props.put('directed', true) - props.put('visited', 0) - - // make sure the in vertex is there but don't add its edges - that will happen later as we are looping - // all vertices in the graph - addVertexToGephi(g, e.inVertex(), true) - - // both vertices are definitely there now, so add the edge - updateGephiGraph([ae: [(e.id().toString()): props]]) - } - - def clearGraph() { - updateGephiGraph([dn: [filter: "ALL"]]) - } - - def resetColorsSizes() { - updateGephiGraph([cn: [filter: [nodeAttribute: [attribute: "visited", value: 1]], - attributes: [size: 1, r: vizDefaultRGBColor[0], g: vizDefaultRGBColor[1], b: vizDefaultRGBColor[2]]]]) - updateGephiGraph([ce: [filter: [edgeAttribute: [attribute: "visited", value: 1]], - attributes: [size: 1, r: vizDefaultRGBColor[0], g: vizDefaultRGBColor[1], b: vizDefaultRGBColor[2]]]]) - } - - def getFromGephiGraph(def Map queryArgs) { - def requestBuilder = RequestBuilder.get("http://$host:$port/$workspace";) - queryArgs.each { requestBuilder = requestBuilder.addParameter(it.key, it.value) } - - def httpResp = makeRequest(requestBuilder.build()) - def resp = EntityUtils.toString(httpResp.entity) - - // gephi streaming plugin does not set the content type or respect the Accept header - treat as text - if (resp.isEmpty()) - return Optional.empty() - else - return Optional.of(new JsonSlurper().parseText(resp)) - } - - def updateGephiGraph(def Map postBody) { - def requestBuilder = RequestBuilder.post("http://$host:$port/$workspace";) - .addParameter("format", "JSON") - .addParameter("operation", "updateGraph") - .setEntity(new StringEntity(JsonOutput.toJson(postBody))) - EntityUtils.consume(makeRequest(requestBuilder.build()).entity) - } - - private CloseableHttpResponse makeRequest(HttpUriRequest request) { - def httpResp = httpclient.execute(request) - if (httpResp.getStatusLine().getStatusCode() == 200) { - return httpResp - } else { - def resp = EntityUtils.toString(httpResp.entity) - throw new RuntimeException("Unsuccessful request to Gephi - [${httpResp.getStatusLine().getStatusCode()}] ${httpResp.getStatusLine().getReasonPhrase()} - $resp") - } - } - - @Override - public String toString() { - return "Gephi - [$workspace]" - } - - private void parseVizStepDelay(String arg) { - try { - vizStepDelay = Long.parseLong(arg) - } catch (Exception ignored) { - throw new RemoteException("The stepDelay must be a long value") - } - } - - private void parseVizStartRGBColor(String arg) { - try { - vizStartRGBColor = arg[1..-2].tokenize(',')*.toFloat() - assert (vizStartRGBColor.length == 3) - } catch (Exception ignored) { - throw new RemoteException("The vizStartRGBColor must be an array of 3 float values, e.g. [0.0,1.0,0.5]") - } - } - - private void parseVizColorToFade(String arg) { - try { - vizColorToFade = arg.charAt(0).toLowerCase(); - assert (vizColorToFade == 'r' || vizColorToFade == 'g' || vizColorToFade == 'b') - } catch (Exception ignored) { - throw new RemoteException("The vizColorToFade must be one character value among: r, g, b, R, G, B") - } - } - - private void parseVizColorFadeRate(String arg) { - try { - vizColorFadeRate = Float.parseFloat(arg) - } catch (Exception ignored) { - throw new RemoteException("The colorFadeRate must be a float value") - } - } - - private void parseVizSizeDecrementRate(String arg) { - try { - vizSizeDecrementRate = Float.parseFloat(arg) - } catch (Exception ignored) { - throw new RemoteException("The sizeDecrementRate must be a float value") - } - } - - private void parseVizStartSize(String arg) { - try { - vizStartSize = Float.parseFloat(arg) - } catch (Exception ignored) { - throw new RemoteException("The startSize must be a float value") - } - } -} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy ---------------------------------------------------------------------- diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy index 54bd119..b7ff7d4 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/ConsolePluginAcceptor.groovy @@ -26,7 +26,7 @@ import org.codehaus.groovy.tools.shell.IO /** * @author Stephen Mallette (http://stephen.genoprime.com) */ -class ConsolePluginAcceptor implements PluginAcceptor { +class ConsolePluginAcceptor implements PluginAcceptor, org.apache.tinkerpop.gremlin.jsr223.console.PluginAcceptor { public static final String ENVIRONMENT_NAME = "console"; public static final String ENVIRONMENT_SHELL = "ConsolePluginAcceptor.shell" http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy ---------------------------------------------------------------------- diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy index 30527a4..4198444 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/GephiRemoteAcceptor.groovy @@ -40,7 +40,6 @@ import org.codehaus.groovy.tools.shell.IO /** * @author Stephen Mallette (http://stephen.genoprime.com) * @author Randall Barnhart (rando...@gmail.com) - * @deprecated As of release 3.2.4, replaced by {@link org.apache.tinkerpop.gremlin.console.jsr223.GephiRemoteAcceptor} */ class GephiRemoteAcceptor implements RemoteAcceptor { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/PluggedIn.groovy ---------------------------------------------------------------------- diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/PluggedIn.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/PluggedIn.groovy index f35d1ed..def49ed 100644 --- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/PluggedIn.groovy +++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/plugin/PluggedIn.groovy @@ -19,6 +19,14 @@ package org.apache.tinkerpop.gremlin.console.plugin import org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin +import org.apache.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor +import org.apache.tinkerpop.gremlin.groovy.plugin.PluginInitializationException +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor +import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteException +import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer +import org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin +import org.apache.tinkerpop.gremlin.jsr223.console.ConsoleCustomizer import org.codehaus.groovy.tools.shell.Groovysh import org.codehaus.groovy.tools.shell.IO @@ -55,4 +63,75 @@ class PluggedIn { void deactivate() { this.activated = false } + + public static class GremlinPluginAdapter implements GremlinPlugin { + org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin corePlugin + + public GremlinPluginAdapter(final org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin corePlugin) { + this.corePlugin = corePlugin + } + + @Override + String getName() { + return corePlugin.getName() + } + + @Override + void pluginTo(final PluginAcceptor pluginAcceptor) throws IllegalEnvironmentException, PluginInitializationException { + // TODO: handle script customizer + corePlugin.getCustomizers("gremlin-groovy").each { + if (it instanceof ImportCustomizer) { + def imports = [] as Set + it.classImports.each { imports.add("import " + it.canonicalName )} + it.methodImports.each { imports.add("import static " + it.declaringClass.canonicalName + "." + it.name) } + it.enumImports.each { imports.add("import static " + it.declaringClass.canonicalName + "." + it.name()) } + pluginAcceptor.addImports(imports) + } + } + } + + @Override + boolean requireRestart() { + return corePlugin.requireRestart() + } + + @Override + Optional<RemoteAcceptor> remoteAcceptor() { + // find a consoleCustomizer if available + if (!corePlugin.getCustomizers("gremlin-groovy").any{ it instanceof ConsoleCustomizer }) + Optional.empty() + + ConsoleCustomizer customizer = (ConsoleCustomizer) corePlugin.getCustomizers("gremlin-groovy").find{ it instanceof ConsoleCustomizer } + return Optional.of(new RemoteAcceptorAdapter(customizer.remoteAcceptor)) + } + } + + public static class RemoteAcceptorAdapter implements RemoteAcceptor { + + private org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor remoteAcceptor + + public RemoteAcceptorAdapter(org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor remoteAcceptor) { + this.remoteAcceptor = remoteAcceptor + } + + @Override + Object connect(final List<String> args) throws RemoteException { + return remoteAcceptor.connect(args) + } + + @Override + Object configure(final List<String> args) throws RemoteException { + return remoteAcceptor.configure(args) + } + + @Override + Object submit(final List<String> args) throws RemoteException { + return remoteAcceptor.submit(args) + } + + @Override + void close() throws IOException { + remoteAcceptor.close() + } + } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/Customizer.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/Customizer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/Customizer.java index 60dc810..ee3548c 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/Customizer.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/Customizer.java @@ -19,7 +19,9 @@ package org.apache.tinkerpop.gremlin.jsr223; /** - * The {@code Customizer} provides a general way to provide configurations to a {@link GremlinScriptEngine}. + * The {@code Customizer} provides a general way to provide configurations to a {@link GremlinScriptEngine}. This is an + * "internal" interface that acts as a marker and should not be implemented directly. Those wishing to write a + * {@code Customizer} should use one of its sub-interfaces, like {@link ImportCustomizer} * * @author Stephen Mallette (http://stephen.genoprime.com) */ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinModule.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinModule.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinModule.java index 1345841..f05b51c 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinModule.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinModule.java @@ -18,6 +18,8 @@ */ package org.apache.tinkerpop.gremlin.jsr223; +import org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor; + import java.util.Optional; /** http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinPlugin.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinPlugin.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinPlugin.java index 390c027..163e364 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinPlugin.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinPlugin.java @@ -58,13 +58,4 @@ public interface GremlinPlugin { * @param scriptEngineName The name of the {@code ScriptEngine} or null to get all the available {@code Customizers} */ public Optional<Customizer[]> getCustomizers(final String scriptEngineName); - - /** - * Allows a plugin to utilize features of the {@code :remote} and {@code :submit} commands of the Gremlin Console. - * This method does not need to be implemented if the plugin is not meant for the Console for some reason or - * if it does not intend to take advantage of those commands. - */ - public default Optional<RemoteAcceptor> remoteAcceptor() { - return Optional.empty(); - } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinPluginException.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinPluginException.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinPluginException.java new file mode 100644 index 0000000..ce4ab2f --- /dev/null +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinPluginException.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tinkerpop.gremlin.jsr223; + +/** + * Base exception for {@link GremlinPlugin}. + * + * @author Stephen Mallette (http://stephen.genoprime.com) + */ +public abstract class GremlinPluginException extends Exception { + public GremlinPluginException() { + } + + public GremlinPluginException(final String message) { + super(message); + } + + public GremlinPluginException(final String message, final Throwable cause) { + super(message, cause); + } + + public GremlinPluginException(final Throwable cause) { + super(cause); + } +} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/RemoteAcceptor.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/RemoteAcceptor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/RemoteAcceptor.java deleted file mode 100644 index 9c96892..0000000 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/RemoteAcceptor.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tinkerpop.gremlin.jsr223; - -import java.io.Closeable; -import java.util.List; - -/** - * The Gremlin Console supports the {@code :remote} and {@code :submit} commands which provide standardized ways - * for plugins to provide "remote connections" to resources and a way to "submit" a command to those resources. - * A "remote connection" does not necessarily have to be a remote server. It simply refers to a resource that is - * external to the console. - * <p/> - * By implementing this interface and returning an instance of it through {@link GremlinPlugin#remoteAcceptor()} a - * plugin can hook into those commands and provide remoting features. - * - * @author Stephen Mallette (http://stephen.genoprime.com) - */ -public interface RemoteAcceptor extends Closeable { - - public static final String RESULT = "result"; - - /** - * Gets called when {@code :remote} is used in conjunction with the "connect" option. It is up to the - * implementation to decide how additional arguments on the line should be treated after "connect". - * - * @return an object to display as output to the user - * @throws RemoteException if there is a problem with connecting - */ - public Object connect(final List<String> args) throws RemoteException; - - /** - * Gets called when {@code :remote} is used in conjunction with the {@code config} option. It is up to the - * implementation to decide how additional arguments on the line should be treated after {@code config}. - * - * @return an object to display as output to the user - * @throws RemoteException if there is a problem with configuration - */ - public Object configure(final List<String> args) throws RemoteException; - - /** - * Gets called when {@code :submit} is executed. It is up to the implementation to decide how additional - * arguments on the line should be treated after {@code :submit}. - * - * @return an object to display as output to the user - * @throws RemoteException if there is a problem with submission - */ - public Object submit(final List<String> args) throws RemoteException; - - /** - * If the {@code RemoteAcceptor} is used in the Gremlin Console, then this method might be called to determine - * if it can be used in a fashion that supports the {@code :remote console} command. By default, this value is - * set to {@code false}. - * <p/> - * A {@code RemoteAcceptor} should only return {@code true} for this method if it expects that all activities it - * supports are executed through the {@code :sumbit} command. If the users interaction with the remote requires - * working with both local and remote evaluation at the same time, it is likely best to keep this method return - * {@code false}. A good example of this type of plugin would be the Gephi Plugin which uses {@code :remote config} - * to configure a local {@code TraversalSource} to be used and expects calls to {@code :submit} for the same body - * of analysis. - */ - public default boolean allowRemoteConsole() { - return false; - } -} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/RemoteException.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/RemoteException.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/RemoteException.java deleted file mode 100644 index a75e6d6..0000000 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/RemoteException.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tinkerpop.gremlin.jsr223; - -/** - * A mapper {@code Exception} to be thrown when there are problems with processing a command given to a - * {@link RemoteAcceptor}. The message provided to the exception will - * be displayed to the user in the Console. - * - * @author Stephen Mallette (http://stephen.genoprime.com) - */ -public class RemoteException extends Exception { - public RemoteException(final String message) { - super(message); - } - - public RemoteException(final String message, final Throwable cause) { - super(message, cause); - } - - public RemoteException(final Throwable cause) { - super(cause); - } -} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/ConsoleCustomizer.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/ConsoleCustomizer.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/ConsoleCustomizer.java new file mode 100644 index 0000000..47771bc --- /dev/null +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/ConsoleCustomizer.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tinkerpop.gremlin.jsr223.console; + +import org.apache.tinkerpop.gremlin.jsr223.Customizer; + +/** + * @author Stephen Mallette (http://stephen.genoprime.com) + */ +public interface ConsoleCustomizer extends Customizer { + /** + * Allows a plugin to utilize features of the {@code :remote} and {@code :submit} commands of the Gremlin Console. + * This method does not need to be implemented if the plugin is not meant for the Console for some reason or + * if it does not intend to take advantage of those commands. + */ + public RemoteAcceptor getRemoteAcceptor(); +} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/PluginAcceptor.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/PluginAcceptor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/PluginAcceptor.java new file mode 100644 index 0000000..ce8b913 --- /dev/null +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/PluginAcceptor.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tinkerpop.gremlin.jsr223.console; + +import org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin; + +import javax.script.ScriptException; +import java.util.Collections; +import java.util.Map; +import java.util.Set; + +/** + * A {@link GremlinPlugin} can be used in multiple environments (e.g. ScriptEngine implementation). Any environment + * wishing to allow plugins should implement the {@code PluginAcceptor}. It acts as an adapter to those environments + * and provides the abstractions required for a plugin to work regardless of the environmental implementations. + * + * @author Stephen Mallette (http://stephen.genoprime.com) + */ +public interface PluginAcceptor { + + public void addImports(final Set<String> importStatements); + + /** + * Add a variable binding for the plugin host. + */ + public void addBinding(final String key, final Object val); + + /** + * Gets the list of bindings from the plugin host. These bindings will represent the "global" binding list. + */ + public Map<String, Object> getBindings(); + + /** + * Evaluate a script in the {@code PluginAcceptor}. + */ + public Object eval(final String script) throws ScriptException; + + /** + * Returns a map of implementation specific variables that can be referenced by the plugin. Those writing + * plugins should examine the details of the various {@code PluginAcceptor} implementations for the variables + * that they pass, as they may provide important information useful to the plugin itself. + */ + public default Map<String, Object> environment() { + return Collections.emptyMap(); + } +} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java new file mode 100644 index 0000000..aee77ae --- /dev/null +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteAcceptor.java @@ -0,0 +1,81 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tinkerpop.gremlin.jsr223.console; + +import java.io.Closeable; +import java.util.List; + +/** + * The Gremlin Console supports the {@code :remote} and {@code :submit} commands which provide standardized ways + * for plugins to provide "remote connections" to resources and a way to "submit" a command to those resources. + * A "remote connection" does not necessarily have to be a remote server. It simply refers to a resource that is + * external to the console. + * <p/> + * By implementing this interface and returning an instance of it through {@link ConsoleCustomizer#getRemoteAcceptor()} + * a plugin can hook into those commands and provide remoting features. + * + * @author Stephen Mallette (http://stephen.genoprime.com) + */ +public interface RemoteAcceptor extends Closeable { + + public static final String RESULT = "result"; + + /** + * Gets called when {@code :remote} is used in conjunction with the "connect" option. It is up to the + * implementation to decide how additional arguments on the line should be treated after "connect". + * + * @return an object to display as output to the user + * @throws RemoteException if there is a problem with connecting + */ + public Object connect(final List<String> args) throws RemoteException; + + /** + * Gets called when {@code :remote} is used in conjunction with the {@code config} option. It is up to the + * implementation to decide how additional arguments on the line should be treated after {@code config}. + * + * @return an object to display as output to the user + * @throws RemoteException if there is a problem with configuration + */ + public Object configure(final List<String> args) throws RemoteException; + + /** + * Gets called when {@code :submit} is executed. It is up to the implementation to decide how additional + * arguments on the line should be treated after {@code :submit}. + * + * @return an object to display as output to the user + * @throws RemoteException if there is a problem with submission + */ + public Object submit(final List<String> args) throws RemoteException; + + /** + * If the {@code RemoteAcceptor} is used in the Gremlin Console, then this method might be called to determine + * if it can be used in a fashion that supports the {@code :remote console} command. By default, this value is + * set to {@code false}. + * <p/> + * A {@code RemoteAcceptor} should only return {@code true} for this method if it expects that all activities it + * supports are executed through the {@code :sumbit} command. If the users interaction with the remote requires + * working with both local and remote evaluation at the same time, it is likely best to keep this method return + * {@code false}. A good example of this type of plugin would be the Gephi Plugin which uses {@code :remote config} + * to configure a local {@code TraversalSource} to be used and expects calls to {@code :submit} for the same body + * of analysis. + */ + public default boolean allowRemoteConsole() { + return false; + } +} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteException.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteException.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteException.java new file mode 100644 index 0000000..7f4850b --- /dev/null +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/console/RemoteException.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.tinkerpop.gremlin.jsr223.console; + +/** + * A mapper {@code Exception} to be thrown when there are problems with processing a command given to a + * {@link RemoteAcceptor}. The message provided to the exception will + * be displayed to the user in the Console. + * + * @author Stephen Mallette (http://stephen.genoprime.com) + */ +public class RemoteException extends Exception { + public RemoteException(final String message) { + super(message); + } + + public RemoteException(final String message, final Throwable cause) { + super(message, cause); + } + + public RemoteException(final Throwable cause) { + super(cause); + } +} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java ---------------------------------------------------------------------- diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java index 9e2b94e..86fb0d8 100644 --- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/GremlinPlugin.java @@ -28,6 +28,7 @@ import java.util.Optional; * of this interface to install. * * @author Stephen Mallette (http://stephen.genoprime.com) + * @deprecated As for 3.2.4, replaced by {@link org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin} */ public interface GremlinPlugin { public static final String ENVIRONMENT = "GremlinPlugin.env"; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java ---------------------------------------------------------------------- diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java index 292ba35..9571381 100644 --- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/PluginAcceptor.java @@ -31,7 +31,9 @@ import java.util.Set; * and provides the abstractions required for a plugin to work regardless of the environmental implementations. * * @author Stephen Mallette (http://stephen.genoprime.com) + * @deprecated As of release 3.2.4, replaced by {@link org.apache.tinkerpop.gremlin.console.PluginAcceptor}. */ +@Deprecated public interface PluginAcceptor { /** * If the {@code PluginAcceptor} implements the {@link DependencyManager} interface it will try to import the http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java ---------------------------------------------------------------------- diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java index b3d03fe..2bb8663 100644 --- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/plugin/RemoteAcceptor.java @@ -33,7 +33,7 @@ import java.util.List; * plugin can hook into those commands and provide remoting features. * * @author Stephen Mallette (http://stephen.genoprime.com) - * @deprecated As of release 3.2.4, replaced by {@link org.apache.tinkerpop.gremlin.jsr223.RemoteAcceptor}; + * @deprecated As of release 3.2.4, replaced by {@link org.apache.tinkerpop.gremlin.jsr223.console.RemoteAcceptor}; */ @Deprecated public interface RemoteAcceptor extends Closeable { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a28100fd/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinEnabledScriptEngineTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinEnabledScriptEngineTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinEnabledScriptEngineTest.java index 34a37ae..9910a4c 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinEnabledScriptEngineTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/jsr223/GremlinEnabledScriptEngineTest.java @@ -56,6 +56,7 @@ public class GremlinEnabledScriptEngineTest { } } + @org.junit.Ignore("TEMPORARY - until GremlinJythonScriptEngine supports this stuff") @Test public void shouldSupportDeprecatedGremlinModules() throws Exception { final GremlinScriptEngineManager mgr = new DefaultGremlinScriptEngineManager();
