You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/03/01 06:35:41 UTC
[groovy] branch master updated (66e932d -> 2a9e615)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 66e932d GROOVY-9430: Add a test(closes #1178)
new 3d09194 Trivial refactoring: replace AIC with lambda
new 2a9e615 Trivial refactoring: replace explicit type with <>
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
[groovy] 02/02: Trivial refactoring: replace explicit type with <>
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 2a9e61519eef53e2a10152ba313c41ac920ef0f4
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Mar 1 14:34:40 2020 +0800
Trivial refactoring: replace explicit type with <>
---
.../main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
index 55b2d9a..fd6f555 100644
--- a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+++ b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
@@ -92,10 +92,10 @@ public class GroovyScriptEngineImpl extends AbstractScriptEngine implements Comp
private static boolean debug = false;
// script-string-to-generated Class map
- private final ManagedConcurrentValueMap<String, Class<?>> classMap = new ManagedConcurrentValueMap<String, Class<?>>(ReferenceBundle.getSoftBundle());
+ private final ManagedConcurrentValueMap<String, Class<?>> classMap = new ManagedConcurrentValueMap<>(ReferenceBundle.getSoftBundle());
// global closures map - this is used to simulate a single
// global functions namespace
- private final ManagedConcurrentValueMap<String, Closure<?>> globalClosures = new ManagedConcurrentValueMap<String, Closure<?>>(ReferenceBundle.getHardBundle());
+ private final ManagedConcurrentValueMap<String, Closure<?>> globalClosures = new ManagedConcurrentValueMap<>(ReferenceBundle.getHardBundle());
// class loader for Groovy generated classes
private GroovyClassLoader loader;
// lazily initialized factory
[groovy] 01/02: Trivial refactoring: replace AIC with lambda
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3d09194b89f4eb198900b915c9fb9962d4653859
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Mar 1 14:32:39 2020 +0800
Trivial refactoring: replace AIC with lambda
---
.../org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
index 15948f2..55b2d9a 100644
--- a/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
+++ b/subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/GroovyScriptEngineImpl.java
@@ -69,15 +69,14 @@ import javax.script.Compilable;
import javax.script.CompiledScript;
import javax.script.Invocable;
import javax.script.ScriptContext;
-import javax.script.ScriptEngineFactory;
import javax.script.ScriptEngine;
+import javax.script.ScriptEngineFactory;
import javax.script.ScriptException;
import javax.script.SimpleBindings;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Reader;
import java.io.Writer;
-import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.security.AccessController;
@@ -427,12 +426,7 @@ public class GroovyScriptEngineImpl extends AbstractScriptEngine implements Comp
return (T) Proxy.newProxyInstance(
clazz.getClassLoader(),
new Class<?>[]{clazz},
- new InvocationHandler() {
- public Object invoke(Object proxy, Method m, Object[] args)
- throws Throwable {
- return invokeImplSafe(thiz, m.getName(), args);
- }
- });
+ (proxy, m, args) -> invokeImplSafe(thiz, m.getName(), args));
}
// determine appropriate class loader to serve as parent loader