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/09/28 16:57:39 UTC
[41/44] tinkerpop git commit: Merge branch 'tp31'
Merge branch 'tp31'
Conflicts:
.gitignore
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/70622cc9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/70622cc9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/70622cc9
Branch: refs/heads/TINKERPOP-944
Commit: 70622cc9d0130eab5efaecb9f15d35fb751ac4c5
Parents: 317fb0c 762f6b2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 28 12:50:01 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 28 12:50:01 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 25 +++-
.../jsr223/GremlinGroovyScriptEngine.java | 140 ++++++++++---------
.../jsr223/GremlinGroovyScriptEngineTest.java | 69 ++++++++-
4 files changed, 162 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70622cc9/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70622cc9/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/70622cc9/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 ecfd168,acc7f90..3ce400e
--- 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
@@@ -669,15 -617,10 +679,15 @@@ public class GremlinGroovyScriptEngine
}
private synchronized void createClassLoader() {
- final CompilerConfiguration conf = new CompilerConfiguration();
+ final CompilerConfiguration conf = new CompilerConfiguration(CompilerConfiguration.DEFAULT);
conf.addCompilationCustomizers(this.importCustomizerProvider.create());
- customizerProviders.forEach(p -> conf.addCompilationCustomizers(p.create()));
+ // ConfigurationCustomizerProvider is treated separately
+ customizerProviders.stream().filter(cp -> !(cp instanceof ConfigurationCustomizerProvider))
+ .forEach(p -> conf.addCompilationCustomizers(p.create()));
+
+ customizerProviders.stream().filter(cp -> cp instanceof ConfigurationCustomizerProvider).findFirst()
+ .ifPresent(cp -> ((ConfigurationCustomizerProvider) cp).applyCustomization(conf));
this.loader = new GremlinGroovyClassLoader(getParentLoader(), conf);
}