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/12 12:45:35 UTC
[47/47] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32'
Conflicts:
gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonGraphSONJavaTranslator.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/506e446d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/506e446d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/506e446d
Branch: refs/heads/master
Commit: 506e446daf9c9cee426f7e253b377348be03aa0c
Parents: 9adf2c6 708c601
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Dec 12 07:11:16 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Dec 12 07:11:16 2016 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 50 +++
.../groovy/plugin/GiraphGremlinPlugin.java | 2 +
.../giraph/jsr223/GiraphGremlinPlugin.java | 58 +++
.../tinkerpop/gremlin/console/Console.groovy | 31 +-
.../ConsoleImportCustomizerProvider.groovy | 2 +
.../tinkerpop/gremlin/console/Mediator.groovy | 4 +-
.../console/commands/InstallCommand.groovy | 14 +-
.../console/jsr223/GephiRemoteAcceptor.groovy | 369 +++++++++++++++++++
.../console/plugin/ConsolePluginAcceptor.groovy | 2 +-
.../console/plugin/GephiRemoteAcceptor.groovy | 2 +
.../gremlin/console/plugin/PluggedIn.groovy | 112 ++++++
.../groovy/plugin/DriverGremlinPlugin.java | 2 +
.../groovy/plugin/DriverRemoteAcceptor.java | 2 +
.../groovy/plugin/GephiGremlinPlugin.java | 1 +
.../groovy/plugin/UtilitiesGremlinPlugin.java | 1 +
.../console/jsr223/DriverGremlinPlugin.java | 104 ++++++
.../console/jsr223/DriverRemoteAcceptor.java | 238 ++++++++++++
.../console/jsr223/GephiGremlinPlugin.java | 41 +++
.../console/jsr223/UtilitiesGremlinPlugin.java | 106 ++++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 3 +
.../jsr223/UtilitiesGremlinPluginScript.groovy | 52 +++
.../groovy/plugin/GremlinPluginAdapterTest.java | 130 +++++++
.../groovy/plugin/script-customizer-1.groovy | 3 +
.../groovy/plugin/script-customizer-2.groovy | 2 +
.../gremlin/jsr223/AbstractGremlinPlugin.java | 58 +++
.../gremlin/jsr223/BindingsCustomizer.java | 33 ++
.../CachedGremlinScriptEngineManager.java | 1 +
.../gremlin/jsr223/CoreGremlinModule.java | 25 +-
.../gremlin/jsr223/CoreGremlinPlugin.java | 62 ++++
.../tinkerpop/gremlin/jsr223/CoreImports.java | 250 +++++++++++++
.../tinkerpop/gremlin/jsr223/Customizer.java | 4 +-
.../jsr223/DefaultBindingsCustomizer.java | 40 ++
.../DefaultGremlinScriptEngineManager.java | 38 +-
.../gremlin/jsr223/DefaultImportCustomizer.java | 102 +++++
.../gremlin/jsr223/DefaultScriptCustomizer.java | 56 +++
.../tinkerpop/gremlin/jsr223/GremlinModule.java | 13 +
.../tinkerpop/gremlin/jsr223/GremlinPlugin.java | 61 +++
.../jsr223/GremlinScriptEngineManager.java | 8 +
.../gremlin/jsr223/ImportCustomizer.java | 83 +----
.../gremlin/jsr223/ImportGremlinPlugin.java | 190 ++++++++++
.../gremlin/jsr223/LazyBindingsCustomizer.java | 39 ++
.../gremlin/jsr223/ScriptCustomizer.java | 34 ++
.../gremlin/jsr223/ScriptEngineCache.java | 54 +++
.../gremlin/jsr223/ScriptFileGremlinPlugin.java | 77 ++++
.../SingleGremlinScriptEngineManager.java | 2 +-
.../jsr223/console/ConsoleCustomizer.java | 33 ++
.../jsr223/console/GremlinShellEnvironment.java | 37 ++
.../gremlin/jsr223/console/PluginAcceptor.java | 62 ++++
.../gremlin/jsr223/console/RemoteAcceptor.java | 83 +++++
.../gremlin/jsr223/console/RemoteException.java | 40 ++
.../tinkerpop/gremlin/util/CoreImports.java | 35 +-
.../gremlin/util/ScriptEngineCache.java | 4 +-
.../jsr223/DefaultImportCustomizerTest.java | 76 ++++
.../jsr223/DefaultScriptCustomizerTest.java | 55 +++
.../gremlin/jsr223/ImportGremlinPluginTest.java | 149 ++++++++
.../gremlin/jsr223/ScriptEngineCacheTest.java | 46 +++
.../jsr223/ScriptFileGremlinPluginTest.java | 62 ++++
.../jsr223/SingleScriptEngineManagerTest.java | 45 +++
.../gremlin/jsr223/script-customizer-1.groovy | 3 +
.../gremlin/jsr223/script-customizer-2.groovy | 2 +
.../dsl/credential/CredentialGraphTest.java | 121 ++++++
.../dsl/credential/CredentialGraphTest.java | 2 +-
.../groovy/util/DependencyGrabber.groovy | 29 +-
.../gremlin/groovy/engine/GremlinExecutor.java | 123 ++++++-
.../gremlin/groovy/engine/ScriptEngines.java | 2 +
.../jsr223/CompileStaticGroovyCustomizer.java | 60 +++
.../jsr223/ConfigurationGroovyCustomizer.java | 82 +++++
.../groovy/jsr223/DependencyManager.java | 3 +
.../jsr223/GremlinGroovyScriptEngine.java | 102 +++--
.../jsr223/GroovyCompilerGremlinPlugin.java | 132 +++++++
.../gremlin/groovy/jsr223/GroovyCustomizer.java | 33 ++
.../groovy/jsr223/ImportGroovyCustomizer.java | 66 ++++
.../jsr223/InterpreterModeGroovyCustomizer.java | 36 ++
.../jsr223/ScriptEnginePluginAcceptor.java | 2 +
.../groovy/jsr223/SugarGremlinPlugin.java | 41 +++
.../jsr223/ThreadInterruptGroovyCustomizer.java | 35 ++
.../jsr223/TimedInterruptGroovyCustomizer.java | 62 ++++
.../jsr223/TimedInterruptTimeoutException.java | 38 ++
.../jsr223/TypeCheckedGroovyCustomizer.java | 65 ++++
.../CompileStaticCustomizerProvider.java | 3 +
.../ConfigurationCustomizerProvider.java | 3 +
.../InterpreterModeCustomizerProvider.java | 5 +
.../ThreadInterruptCustomizerProvider.java | 3 +
.../TimedInterruptCustomizerProvider.java | 3 +
.../TimedInterruptTimeoutException.java | 4 +
.../TypeCheckedCustomizerProvider.java | 3 +
.../VariableIdentificationCustomizer.java | 2 +
.../jsr223/dsl/credential/CredentialGraph.java | 121 ++++++
.../CredentialGraphGremlinPlugin.java | 51 +++
.../dsl/credential/CredentialGraphTokens.java | 31 ++
.../groovy/plugin/AbstractGremlinPlugin.java | 2 +
.../gremlin/groovy/plugin/Artifact.java | 2 +
.../gremlin/groovy/plugin/GremlinPlugin.java | 1 +
.../groovy/plugin/GremlinPluginException.java | 2 +
.../plugin/IllegalEnvironmentException.java | 2 +
.../gremlin/groovy/plugin/PluginAcceptor.java | 2 +
.../plugin/PluginInitializationException.java | 2 +
.../gremlin/groovy/plugin/RemoteAcceptor.java | 2 +
.../gremlin/groovy/plugin/RemoteException.java | 2 +
.../groovy/plugin/SugarGremlinPlugin.java | 2 +
.../plugin/dsl/credential/CredentialGraph.java | 2 +
.../CredentialGraphGremlinPlugin.java | 2 +
.../dsl/credential/CredentialGraphTokens.java | 2 +
.../tinkerpop/gremlin/groovy/util/Artifact.java | 86 +++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 2 +
...aultDefaultImportCustomizerProviderTest.java | 90 +++++
.../DefaultImportCustomizerProviderTest.java | 90 -----
...mlinGroovyScriptEngineCompileStaticTest.java | 72 +++-
.../GremlinGroovyScriptEngineConfigTest.java | 11 +-
.../jsr223/GremlinGroovyScriptEngineTest.java | 52 ++-
...inGroovyScriptEngineThreadInterruptTest.java | 23 +-
...linGroovyScriptEngineTimedInterruptTest.java | 65 +++-
...remlinGroovyScriptEngineTypeCheckedTest.java | 72 +++-
.../jsr223/GroovyCompilerGremlinPluginTest.java | 128 +++++++
.../gremlin/groovy/plugin/ArtifactTest.java | 2 -
.../gremlin/groovy/util/ArtifactTest.java | 85 +++++
.../python/TraversalSourceGenerator.groovy | 2 +-
.../jsr223/GremlinJythonScriptEngine.java | 172 ++++++---
.../GremlinJythonScriptEngineFactory.java | 9 +-
.../jsr223/GremlinJythonScriptEngineTest.java | 12 +-
.../python/jsr223/JythonScriptEngineSetup.java | 2 +-
.../python/jsr223/JythonTranslatorTest.java | 10 -
.../jsr223/PythonGraphSONJavaTranslator.java | 2 +-
.../gremlin/python/jsr223/PythonProvider.java | 5 +-
.../tinkerpop/gremlin/server/Settings.java | 8 +
.../jsr223/GremlinServerGremlinPlugin.java | 42 +++
.../server/op/AbstractEvalOpProcessor.java | 5 +
.../server/util/ServerGremlinExecutor.java | 16 +-
.../jsr223/GremlinEnabledScriptEngineTest.java | 37 +-
.../groovy/plugin/HadoopGremlinPlugin.java | 2 +
.../groovy/plugin/HadoopRemoteAcceptor.java | 2 +
.../hadoop/jsr223/HadoopGremlinPlugin.java | 159 ++++++++
.../hadoop/jsr223/HadoopRemoteAcceptor.java | 127 +++++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
.../neo4j/groovy/plugin/Neo4jGremlinPlugin.java | 2 +
.../neo4j/jsr223/Neo4jGremlinPlugin.java | 71 ++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
pom.xml | 25 +-
.../spark/groovy/plugin/SparkGremlinPlugin.java | 2 +
.../spark/jsr223/SparkGremlinPlugin.java | 92 +++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
.../groovy/plugin/TinkerGraphGremlinPlugin.java | 3 +-
.../jsr223/TinkerGraphGremlinPlugin.java | 72 ++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
145 files changed, 5879 insertions(+), 364 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/506e446d/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/506e446d/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/506e446d/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/506e446d/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
----------------------------------------------------------------------
diff --cc gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
index 20e6a2d,1fb2efc..5de06e5
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
@@@ -184,11 -188,22 +188,14 @@@ public class GremlinGroovyScriptEngine
* Creates a new instance using the {@link DefaultImportCustomizerProvider}.
*/
public GremlinGroovyScriptEngine() {
- this((CompilerCustomizerProvider) new DefaultImportCustomizerProvider());
+ this(new Customizer[0]);
}
- /**
- * @deprecated As of release 3.0.1, replaced by {@link #GremlinGroovyScriptEngine(CompilerCustomizerProvider...)}
- */
- @Deprecated
- public GremlinGroovyScriptEngine(final ImportCustomizerProvider importCustomizerProvider) {
- this((CompilerCustomizerProvider) importCustomizerProvider);
- }
-
public GremlinGroovyScriptEngine(final Customizer... customizers) {
- final List<Customizer> listOfCustomizers = Arrays.asList(customizers);
+ final List<Customizer> listOfCustomizers = new ArrayList<>(Arrays.asList(customizers));
+
+ // always need this plugin for a scriptengine to be "Gremlin-enabled"
+ CoreGremlinPlugin.instance().getCustomizers("gremlin-groovy").ifPresent(c -> listOfCustomizers.addAll(Arrays.asList(c)));
GremlinLoader.load();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/506e446d/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonGraphSONJavaTranslator.java
----------------------------------------------------------------------
diff --cc gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonGraphSONJavaTranslator.java
index 9da5454,740fe1f..09a457c
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonGraphSONJavaTranslator.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonGraphSONJavaTranslator.java
@@@ -28,11 -28,7 +29,10 @@@ import org.apache.tinkerpop.gremlin.pro
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2d0;
- import org.apache.tinkerpop.gremlin.util.ScriptEngineCache;
+import org.apache.tinkerpop.shaded.jackson.core.JsonFactory;
+import org.apache.tinkerpop.shaded.jackson.databind.ObjectMapper;
import javax.script.Bindings;
import javax.script.ScriptContext;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/506e446d/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/506e446d/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index a72f5ac,3c5f8ed..f6c3cc4
--- a/pom.xml
+++ b/pom.xml
@@@ -283,11 -284,12 +283,13 @@@ limitations under the License
<exclude>**/*.json</exclude>
<exclude>**/*.xml</exclude>
<exclude>**/*.ldjson</exclude>
+ <exclude>**/*.graffle</exclude>
<exclude>**/goal.txt</exclude>
- <exclude>**/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/script/*.txt</exclude>
<exclude>**/src/main/resources/META-INF/services/**</exclude>
<exclude>**/src/test/resources/META-INF/services/**</exclude>
+ <exclude>**/src/test/resources/org/apache/tinkerpop/gremlin/console/groovy/plugin/script-customizer-*.groovy</exclude>
+ <exclude>**/src/test/resources/org/apache/tinkerpop/gremlin/jsr223/script-customizer-*.groovy</exclude>
+ <exclude>**/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/script/*.txt</exclude>
<exclude>**/src/main/ext/**</exclude>
<exclude>**/src/main/static/**</exclude>
<exclude>**/_bsp/**</exclude>