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 2021/01/31 08:36:08 UTC
[groovy] branch GROOVY-9922 updated (c8ba5a9 -> 45ba044)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY-9922
in repository https://gitbox.apache.org/repos/asf/groovy.git.
discard c8ba5a9 Rename DGM `getProcessId` to `getPid` and put it into vmplugin10
new 45ba044 Rename DGM `getProcessId` to `getPid` and put it into vmplugin10
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (c8ba5a9)
\
N -- N -- N refs/heads/GROOVY-9922 (45ba044)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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/vmplugin/v10/PluginDefaultGroovyMethods.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[groovy] 01/01: Rename DGM `getProcessId` to `getPid` and put it
into vmplugin10
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-9922
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 45ba04421272413fd239433544c7e8a84748ea6b
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Jan 31 15:35:05 2021 +0800
Rename DGM `getProcessId` to `getPid` and put it into vmplugin10
---
.../src/main/groovy/org.apache.groovy-core.gradle | 12 +++++
.../groovy/runtime/DefaultGroovyStaticMethods.java | 16 -------
.../codehaus/groovy/vmplugin/VMPluginFactory.java | 54 ++++++++++++----------
.../org/codehaus/groovy/vmplugin/v10/Java10.java} | 29 +++++++++---
.../vmplugin/v10/PluginDefaultGroovyMethods.java} | 24 +++++++---
.../org/codehaus/groovy/vmplugin/v8/Java8.java | 11 +++--
.../vmplugin/v8/PluginDefaultGroovyMethods.java | 17 +++++++
.../org/codehaus/groovy/vmplugin/v9/Java9.java | 15 ++----
src/test/groovy/bugs/Groovy9922.groovy | 4 +-
subprojects/groovy-binary/build.gradle | 3 +-
10 files changed, 115 insertions(+), 70 deletions(-)
diff --git a/buildSrc/src/main/groovy/org.apache.groovy-core.gradle b/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
index 9e5fd1c..e937221 100644
--- a/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
+++ b/buildSrc/src/main/groovy/org.apache.groovy-core.gradle
@@ -46,12 +46,20 @@ sourceSets {
exclude '**/vm9/*'
exclude '**/PlatformLog.java'
}
+ if (!JavaVersion.current().isJava10Compatible()) {
+ exclude '**/v10/*'
+ exclude '**/vm10/*'
+ }
}
groovy {
if (!JavaVersion.current().isJava9Compatible()) {
exclude '**/v9/*'
exclude '**/vm9/*'
}
+ if (!JavaVersion.current().isJava10Compatible()) {
+ exclude '**/v10/*'
+ exclude '**/vm10/*'
+ }
}
antlr {
srcDirs = ['src/antlr']
@@ -67,6 +75,10 @@ sourceSets {
exclude '**/v9/*'
exclude '**/vm9/*'
}
+ if (!JavaVersion.current().isJava10Compatible()) {
+ exclude '**/v10/*'
+ exclude '**/vm10/*'
+ }
}
resources {
srcDirs += ['src/test-resources']
diff --git a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java
index cffb8b7..e4d3797 100644
--- a/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/DefaultGroovyStaticMethods.java
@@ -241,20 +241,4 @@ public class DefaultGroovyStaticMethods {
public static long currentTimeSeconds(System self) {
return System.currentTimeMillis() / 1000;
}
-
- /**
- * Get the pid of the current Java process
- *
- * @param self
- * @return the pid
- * @since 4.0.0
- */
- public static String getProcessId(Runtime self) {
- String name = ManagementFactory.getRuntimeMXBean().getName();
- int index = name.indexOf('@');
- if (-1 == index) { // should never happen
- return name;
- }
- return name.substring(0, index);
- }
}
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/VMPluginFactory.java b/src/main/java/org/codehaus/groovy/vmplugin/VMPluginFactory.java
index 10b0e30..7e2d66b 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/VMPluginFactory.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/VMPluginFactory.java
@@ -18,13 +18,18 @@
*/
package org.codehaus.groovy.vmplugin;
+import org.apache.groovy.util.Maps;
import org.codehaus.groovy.runtime.DefaultGroovyMethods;
+import java.math.BigDecimal;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static org.codehaus.groovy.runtime.DefaultGroovyMethods.isAtLeast;
+
/**
* Factory class to get functionality based on the VM version.
* The usage of this class is not for public use, only for the
@@ -32,43 +37,44 @@ import java.util.logging.Logger;
*/
public class VMPluginFactory {
private static final Logger LOGGER = Logger.getLogger(VMPluginFactory.class.getName());
-
- private static final String JDK8_CLASSNAME_CHECK = "java.util.Optional";
- private static final String JDK9_CLASSNAME_CHECK = "java.lang.Module";
-
- private static final String JDK8_PLUGIN_NAME = "org.codehaus.groovy.vmplugin.v8.Java8";
- private static final String JDK9_PLUGIN_NAME = "org.codehaus.groovy.vmplugin.v9.Java9";
+ private static final Map<BigDecimal, String> PLUGIN_MAP = Maps.of(
+ // Note: list the vm plugin entries in *descending* order:
+ new BigDecimal("10"), "org.codehaus.groovy.vmplugin.v10.Java10",
+ new BigDecimal("9"), "org.codehaus.groovy.vmplugin.v9.Java9",
+ new BigDecimal("1.8"), "org.codehaus.groovy.vmplugin.v8.Java8"
+ );
private static final VMPlugin PLUGIN;
static {
- VMPlugin target = createPlugin(JDK9_CLASSNAME_CHECK, JDK9_PLUGIN_NAME);
- if (target == null) {
- target = createPlugin(JDK8_CLASSNAME_CHECK, JDK8_PLUGIN_NAME);
- }
-
- PLUGIN = target;
+ PLUGIN = createPlugin();
}
public static VMPlugin getPlugin() {
return PLUGIN;
}
- private static VMPlugin createPlugin(final String classNameCheck, final String pluginName) {
+ private static VMPlugin createPlugin() {
return AccessController.doPrivileged((PrivilegedAction<VMPlugin>) () -> {
- try {
- ClassLoader loader = VMPluginFactory.class.getClassLoader();
- loader.loadClass(classNameCheck);
- return (VMPlugin) loader.loadClass(pluginName).getDeclaredConstructor().newInstance();
- } catch (Throwable t) {
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.fine("Trying to create VM plugin `" + pluginName + "` by checking `" + classNameCheck
- + "`, but failed:\n" + DefaultGroovyMethods.asString(t)
- );
- }
+ final BigDecimal specVer = new BigDecimal(System.getProperty("java.specification.version"));
+ ClassLoader loader = VMPluginFactory.class.getClassLoader();
+ for (Map.Entry<BigDecimal, String> entry : PLUGIN_MAP.entrySet()) {
+ if (isAtLeast(specVer, entry.getKey())) {
+ final String pluginName = entry.getValue();
+ try {
+ return (VMPlugin) loader.loadClass(pluginName).getDeclaredConstructor().newInstance();
+ } catch (Throwable t) {
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.fine("Trying to create VM plugin `" + pluginName + "`, but failed:\n" + DefaultGroovyMethods.asString(t)
+ );
+ }
- return null;
+ return null;
+ }
+ }
}
+
+ return null;
});
}
}
diff --git a/src/test/groovy/bugs/Groovy9922.groovy b/src/main/java/org/codehaus/groovy/vmplugin/v10/Java10.java
similarity index 53%
copy from src/test/groovy/bugs/Groovy9922.groovy
copy to src/main/java/org/codehaus/groovy/vmplugin/v10/Java10.java
index fcc9644..e9f1bd9 100644
--- a/src/test/groovy/bugs/Groovy9922.groovy
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v10/Java10.java
@@ -16,13 +16,30 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.bugs
+package org.codehaus.groovy.vmplugin.v10;
-import org.junit.Test
+import org.codehaus.groovy.vmplugin.v9.Java9;
-final class Groovy9922 {
- @Test
- void testGetProcessId() {
- assert "jps".execute().text.contains("${Runtime.processId} ")
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Additional Java 10 based functions will be added here as needed.
+ */
+public class Java10 extends Java9 {
+ private final Class<?>[] PLUGIN_DGM;
+
+ public Java10() {
+ super();
+ List<Class<?>> dgmClasses = new ArrayList<>();
+ Collections.addAll(dgmClasses, super.getPluginDefaultGroovyMethods());
+ dgmClasses.add(PluginDefaultGroovyMethods.class);
+ PLUGIN_DGM = dgmClasses.toArray(new Class<?>[0]);
+ }
+
+ @Override
+ public Class<?>[] getPluginDefaultGroovyMethods() {
+ return PLUGIN_DGM;
}
}
diff --git a/src/test/groovy/bugs/Groovy9922.groovy b/src/main/java/org/codehaus/groovy/vmplugin/v10/PluginDefaultGroovyMethods.java
similarity index 61%
copy from src/test/groovy/bugs/Groovy9922.groovy
copy to src/main/java/org/codehaus/groovy/vmplugin/v10/PluginDefaultGroovyMethods.java
index fcc9644..9529959 100644
--- a/src/test/groovy/bugs/Groovy9922.groovy
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v10/PluginDefaultGroovyMethods.java
@@ -16,13 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
-package groovy.bugs
+package org.codehaus.groovy.vmplugin.v10;
-import org.junit.Test
+import java.lang.management.ManagementFactory;
-final class Groovy9922 {
- @Test
- void testGetProcessId() {
- assert "jps".execute().text.contains("${Runtime.processId} ")
+/**
+ * Defines new Groovy methods which appear on normal JDK 10
+ * classes inside the Groovy environment.
+ *
+ * @since 4.0.0
+ */
+public class PluginDefaultGroovyMethods {
+ /**
+ * Get the pid of the current Java process
+ *
+ * @param self
+ * @return the pid
+ * @since 4.0.0
+ */
+ public static String getPid(Runtime self) {
+ return String.valueOf(ManagementFactory.getRuntimeMXBean().getPid());
}
}
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/Java8.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/Java8.java
index 67965fb..e16bba9 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v8/Java8.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/Java8.java
@@ -141,6 +141,10 @@ public class Java8 implements VMPlugin {
mn.setAnnotationDefault(true);
}
+ protected MethodHandles.Lookup newLookup(final Class<?> declaringClass) {
+ return of(declaringClass);
+ }
+
private static Constructor<MethodHandles.Lookup> getLookupConstructor() {
return LookupHolder.LOOKUP_Constructor;
}
@@ -623,16 +627,13 @@ public class Java8 implements VMPlugin {
public Object getInvokeSpecialHandle(Method method, Object receiver) {
final Class<?> receiverType = receiver.getClass();
try {
- return of(receiverType).unreflectSpecial(method, receiverType).bindTo(receiver);
+ return newLookup(receiverType).unreflectSpecial(method, receiverType).bindTo(receiver);
} catch (ReflectiveOperationException e) {
return getInvokeSpecialHandleFallback(method, receiver);
}
}
private Object getInvokeSpecialHandleFallback(Method method, Object receiver) {
- if (getLookupConstructor() == null) {
- throw new GroovyBugError("getInvokeSpecialHandle requires at least JDK 7 for private access to Lookup");
- }
if (!method.isAccessible()) {
AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
ReflectionUtils.trySetAccessible(method);
@@ -641,7 +642,7 @@ public class Java8 implements VMPlugin {
}
Class<?> declaringClass = method.getDeclaringClass();
try {
- return getLookupConstructor().newInstance(declaringClass, -1 /* TRUSTED */).
+ return newLookup(declaringClass).
unreflectSpecial(method, declaringClass).
bindTo(receiver);
} catch (ReflectiveOperationException e) {
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
index dc80f16..106d209 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
@@ -29,6 +29,7 @@ import org.codehaus.groovy.runtime.InvokerHelper;
import org.codehaus.groovy.runtime.NullObject;
import org.codehaus.groovy.runtime.RangeInfo;
+import java.lang.management.ManagementFactory;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -922,4 +923,20 @@ public class PluginDefaultGroovyMethods extends DefaultGroovyMethodsSupport {
}
return (Optional<T>) supplier.get();
}
+
+ /**
+ * Get the pid of the current Java process
+ *
+ * @param self
+ * @return the pid
+ * @since 4.0.0
+ */
+ public static String getPid(Runtime self) {
+ String name = ManagementFactory.getRuntimeMXBean().getName();
+ int index = name.indexOf('@');
+ if (-1 == index) { // should never happen
+ return name;
+ }
+ return name.substring(0, index);
+ }
}
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
index 27954d1..fc7a9f9 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v9/Java9.java
@@ -156,6 +156,11 @@ public class Java9 extends Java8 {
}
}
+ @Override
+ protected MethodHandles.Lookup newLookup(final Class<?> declaringClass) {
+ return of(declaringClass);
+ }
+
private static Constructor<MethodHandles.Lookup> getLookupConstructor() {
return LookupHolder.LOOKUP_Constructor;
}
@@ -188,16 +193,6 @@ public class Java9 extends Java8 {
return 9;
}
- @Override
- public Object getInvokeSpecialHandle(Method method, Object receiver) {
- final Class<?> receiverType = receiver.getClass();
- try {
- return of(receiverType).unreflectSpecial(method, receiverType).bindTo(receiver);
- } catch (ReflectiveOperationException e) {
- return super.getInvokeSpecialHandle(method, receiver);
- }
- }
-
/**
* This method may be used by a caller in class C to check whether to enable access to a member of declaring class D successfully
* if {@link Java8#checkCanSetAccessible(java.lang.reflect.AccessibleObject, java.lang.Class)} returns true and any of the following hold:
diff --git a/src/test/groovy/bugs/Groovy9922.groovy b/src/test/groovy/bugs/Groovy9922.groovy
index fcc9644..4ead1ae 100644
--- a/src/test/groovy/bugs/Groovy9922.groovy
+++ b/src/test/groovy/bugs/Groovy9922.groovy
@@ -22,7 +22,7 @@ import org.junit.Test
final class Groovy9922 {
@Test
- void testGetProcessId() {
- assert "jps".execute().text.contains("${Runtime.processId} ")
+ void testGetPid() {
+ assert "jps".execute().text.contains("${Runtime.getRuntime().getPid()} ")
}
}
diff --git a/subprojects/groovy-binary/build.gradle b/subprojects/groovy-binary/build.gradle
index 6354cd2..9df3bbf 100644
--- a/subprojects/groovy-binary/build.gradle
+++ b/subprojects/groovy-binary/build.gradle
@@ -47,7 +47,8 @@ distribution {
'org.codehaus.groovy.runtime.SocketGroovyMethods',
'org.codehaus.groovy.runtime.StringGroovyMethods',
'org.codehaus.groovy.vmplugin.v8.PluginDefaultGroovyMethods',
- 'org.codehaus.groovy.vmplugin.v9.PluginDefaultGroovyMethods'
+ 'org.codehaus.groovy.vmplugin.v9.PluginDefaultGroovyMethods',
+ 'org.codehaus.groovy.vmplugin.v10.PluginDefaultGroovyMethods'
docs ':groovy-dateutil', 'org.apache.groovy.dateutil.extensions.DateUtilExtensions'
docs ':groovy-datetime', 'org.apache.groovy.datetime.extensions.DateTimeExtensions',
'org.apache.groovy.datetime.extensions.DateTimeStaticExtensions'